Add possibility to specify location of HTS header files

karel-brinda · Aug 28, 2016 · 30a0f75 · 30a0f75
1 parent 9efcb10
commit 30a0f75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -9,12 +9,15 @@ MANPAGE   = ococo.1
 
 HTSLIBDIR = ext/htslib
 HTSLIB    = $(HTSLIBDIR)/libhts.a
+HTSLIBINCLUDE = $(HTSLIBDIR)
 
 export CXX
 export CXXFLAGS
 
 export HTSLIBDIR
 export HTSLIB
+export HTSLIBINCLUDE
+
 
 .PHONY: all clean install ococo
 

diff --git a/src/Makefile b/src/Makefile
@@ -5,11 +5,11 @@ all: misc.o main.o params.o
 HEADERS=types.h stats.h version.h
 
 main.o: main.cpp consensus.h caller.h version.h $(HEADERS)
-	$(CXX) $(CXXFLAGS) $(DFLAGS) -c $< -I ../$(HTSLIB)
+	$(CXX) $(CXXFLAGS) $(DFLAGS) -c $< -I ../$(HTSLIBINCLUDE)
 
 
 %.o: %.cpp %.h $(HEADERS)
-	$(CXX) $(CXXFLAGS) $(DFLAGS) -c $< -I ../$(HTSLIB)
+	$(CXX) $(CXXFLAGS) $(DFLAGS) -c $< -I ../$(HTSLIBINCLUDE)
 
 clean:
 	rm -f *.o