Author: Andreas Tille <tille@debian.org>
Last-Update: Fri, 09 Dec 2016 14:26:08 +0100
Description: Use Debian packaged samtools

--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ BOOST = .
 
 # Compilation variables
 CXX = g++
-CXXFLAGS += -std=gnu++98 -Wall -I. -I$(BOOST) -I$(SAMTOOLS)/$(HTSLIB)
+CXXFLAGS += -std=gnu++98 -Wall -I. -I$(BOOST)
 CPPFLAGS ?=
 
 LDFLAGS ?=
@@ -30,8 +30,8 @@ exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 
 # Auxiliary variables for compilation
-SAMHEADERS = $(SAMTOOLS)/$(HTSLIB)/htslib/sam.h
-SAMLIBS = $(SAMTOOLS)/$(HTSLIB)/libhts.a
+SAMHEADERS = 
+SAMLIBS = 
 CONFIGURE = ./configure
 
 OBJS1 = parseIt.o
@@ -54,12 +54,12 @@ SCRIPTS = rsem-prepare-reference rsem-ca
 
 .PHONY : all ebseq pRSEM clean
 
-all : $(PROGRAMS) $(SAMTOOLS)/samtools
+all : $(PROGRAMS)
 
 $(SAMTOOLS)/samtools :
 	cd $(SAMTOOLS) && $(CONFIGURE) --without-curses && $(MAKE) -f $(SAMTOOLS_MAKEFILE) samtools
 
-$(SAMLIBS) : $(SAMTOOLS)/samtools
+$(SAMLIBS) : 
 
 
 # Compile objects
@@ -78,10 +78,10 @@ $(PROGS1) :
 	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(PROGS2) :
-	$(CXX) $(LDFLAGS) -pthread -o $@ $^ $(LDLIBS) -lz
+	$(CXX) $(LDFLAGS) -pthread -o $@ $^ $(LDLIBS) -lhts -lz
 
 $(PROGS3) :
-	$(CXX) $(LDFLAGS) -pthread -o $@ $^ $(LDLIBS)
+	$(CXX) $(LDFLAGS) -pthread -o $@ $^ $(LDLIBS) -lhts
 
 
 # Dependencies for executables
@@ -163,17 +163,13 @@ pRSEM :
 
 
 # Install RSEM
-install : $(PROGRAMS) $(SCRIPTS) $(SAMTOOLS)/samtools rsem_perl_utils.pm
-	$(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)/$(SAMTOOLS)
-	$(foreach prog,$(PROGRAMS),$(INSTALL_PROGRAM) $(prog) $(DESTDIR)$(bindir)/$(prog) ; $(STRIP) $(DESTDIR)$(bindir)/$(prog) ;)
-	$(INSTALL_PROGRAM) $(SAMTOOLS)/samtools $(DESTDIR)$(bindir)/$(SAMTOOLS)/samtools
-	$(STRIP) $(DESTDIR)$(bindir)/$(SAMTOOLS)/samtools
+install : $(PROGRAMS) $(SCRIPTS) rsem_perl_utils.pm
+	$(foreach prog,$(PROGRAMS),$(INSTALL_PROGRAM) $(prog) $(DESTDIR)$(bindir)/$(prog) ; )
 	$(foreach script,$(SCRIPTS),$(INSTALL_PROGRAM) $(script) $(DESTDIR)$(bindir)/$(script) ;)
 	$(INSTALL_DATA) rsem_perl_utils.pm $(DESTDIR)$(bindir)/rsem_perl_utils.pm
 
 # Clean
 clean :
 	rm -f *.o *~ $(PROGRAMS)
-	cd $(SAMTOOLS) && $(MAKE) clean-all
 	cd EBSeq && $(MAKE) clean
 	cd pRSEM && $(MAKE) clean
