removed extraneous #include for hts support. updated version number. …

…added dependencies in Makefile so that users who clone can compile with htslib support
smithlabcode · Oct 15, 2020 · 25d3e40 · 25d3e40
1 parent add224c
commit 25d3e40
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Makefile b/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

diff --git a/src/load_data_for_complexity.cpp b/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

diff --git a/src/preseq.cpp b/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) {