[med-svn] [libvcflib] 02/02: Pass build options for libfastahack

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libvcflib.

commit 73216213f4c14bb9e92c088d876c6a1b32b28d2a
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 23 17:22:44 2016 +0200

    Pass build options for libfastahack
---
 debian/patches/use_debian_packaged_fastahack.patch | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/patches/use_debian_packaged_fastahack.patch b/debian/patches/use_debian_packaged_fastahack.patch
index bb50306..b51e101 100644
--- a/debian/patches/use_debian_packaged_fastahack.patch
+++ b/debian/patches/use_debian_packaged_fastahack.patch
@@ -8,7 +8,19 @@
  SMITHWATERMAN = smithwaterman/SmithWatermanGotoh.o
  REPEATS = smithwaterman/Repeats.o
  INDELALLELE = smithwaterman/IndelAllele.o
-@@ -179,9 +178,6 @@ $(LEFTALIGN): $(SMITHWATERMAN)
+@@ -124,9 +123,8 @@ LEFTALIGN = smithwaterman/LeftAlign.o
+ FSOM = fsom/fsom.o
+ FILEVERCMP = filevercmp/filevercmp.o
+ 
+-INCLUDES = `pkg-config --cflags libsmithwaterman` -I$(INC_DIR)
+-LDFLAGS += -L$(LIB_DIR) -lvcflib -lhts -lpthread -lz -lm -fopenmp -ltabixpp `pkg-config --libs libsmithwaterman`
+-
++INCLUDES = `pkg-config --cflags libsmithwaterman` `pkg-config --cflags libfastahack` -I$(INC_DIR)
++LDFLAGS += -L$(LIB_DIR) -lvcflib -lhts -lpthread -lz -lm -fopenmp -ltabixpp `pkg-config --libs libsmithwaterman` `pkg-config --libs libfastahack`
+ 
+ all: $(OBJECTS) $(BINS)
+ 
+@@ -179,9 +177,6 @@ $(LEFTALIGN): $(SMITHWATERMAN)
  
  $(INDELALLELE): $(SMITHWATERMAN)
  
@@ -18,7 +30,7 @@
  #$(FSOM):
  #	cd fsom && $(CXX) $(CXXFLAGS) -c fsom.c -lm
  
-@@ -196,11 +192,11 @@ $(FILEVERCMP): pre
+@@ -196,11 +191,11 @@ $(FILEVERCMP): pre
  $(SHORTBINS): pre
  	$(MAKE) bin/$@
  
@@ -33,7 +45,7 @@
  	cp libvcflib.a $(LIB_DIR)
  
  
-@@ -229,6 +225,6 @@ clean:
+@@ -229,6 +224,6 @@ clean:
  	rm -rf $(OBJ_DIR)
  	# cd tabixpp && make clean
  	# cd smithwaterman && make clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libvcflib.git