removed extraneous #include for hts support. updated version number. added dependencies in Makefile so that users who clone can compile with htslib support

Author: terencewtli

src/Makefile

@@ -42,7 +42,8 @@ $(PROGS): $(addprefix smithlab_cpp/, \
 	OptionParser.o MappedRead.o)
 
 ifdef HAVE_HTSLIB
-preseq to-mr: $(addprefix smithlab_cpp/, htslib_wrapper.o)
+preseq to-mr: $(addprefix smithlab_cpp/, \
+  htslib_wrapper_deprecated.o cigar_utils.o)
 endif
 
 preseq: continued_fraction.o load_data_for_complexity.o moment_sequence.o

src/load_data_for_complexity.cpp

@@ -181,7 +181,6 @@ empty_pq(GenomicRegion &curr_gr, GenomicRegion &prev_gr,
  */
 #ifdef HAVE_HTSLIB
 // switching dependency on bamtools to samtools
-#include <htslib_wrapper.hpp>
 #include "htslib_wrapper_deprecated.hpp"
 
 size_t

src/preseq.cpp

@@ -56,7 +56,7 @@ using std::to_string;
 using std::mt19937;
 using std::max;
 
-static const string preseq_version = "3.0.2";
+static const string preseq_version = "3.1.1";
 
 template <typename T> T
 get_counts_from_hist(const vector<T> &h) {