[med-svn] [libseqlib] 04/04: Use pkg-config

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libseqlib.

commit 0f62dcec5f7e345601f9c7c4d304671763f58035
Author: Andreas Tille <tille at debian.org>
Date:   Thu Feb 9 16:45:41 2017 +0100

    Use pkg-config
---
 debian/patches/dynamic_lib.patch             | 2 +-
 debian/patches/series                        | 1 +
 debian/patches/use_debian_packaged_ssw.patch | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/patches/dynamic_lib.patch b/debian/patches/dynamic_lib.patch
index cf9538e..e3f5205 100644
--- a/debian/patches/dynamic_lib.patch
+++ b/debian/patches/dynamic_lib.patch
@@ -9,7 +9,7 @@ Description: Create dynamic library
 +lib_LTLIBRARIES  = libseqlib.la
  
 -libseqlib_a_CPPFLAGS = -I../ -I../htslib -I/usr/include/fml -Wno-sign-compare
-+libseqlib_la_CPPFLAGS = -I../ -I../htslib -I/usr/include/fml -Wno-sign-compare
++libseqlib_la_CPPFLAGS = `pkg-config --cflags htslib` -I/usr/include/fml -Wno-sign-compare
  
 -libseqlib_a_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp jsoncpp.cpp ssw_cpp.cpp ssw.c \
 +libseqlib_la_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp jsoncpp.cpp ssw_cpp.cpp ssw.c \
diff --git a/debian/patches/series b/debian/patches/series
index a9f8c96..cfc474e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fml_include_path.patch
 dynamic_lib.patch
 use_debian_packaged_jsoncpp.patch
 use_debian_packaged_ssw.patch
+pkg-config.patch
diff --git a/debian/patches/use_debian_packaged_ssw.patch b/debian/patches/use_debian_packaged_ssw.patch
index a495193..d67b079 100644
--- a/debian/patches/use_debian_packaged_ssw.patch
+++ b/debian/patches/use_debian_packaged_ssw.patch
@@ -14,7 +14,7 @@ Description: Do not use code copy of libssw
 +++ b/src/Makefile.am
 @@ -2,7 +2,7 @@ lib_LTLIBRARIES  = libseqlib.la
  
- libseqlib_la_CPPFLAGS = -I../ -I../htslib -I/usr/include/fml -I/usr/include/jsoncpp/ -Wno-sign-compare
+ libseqlib_la_CPPFLAGS = `pkg-config --cflags htslib` -I/usr/include/fml `pkg-config --cflags jsoncpp` -Wno-sign-compare
  
 -libseqlib_la_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp ssw_cpp.cpp ssw.c \
 +libseqlib_la_SOURCES =   FastqReader.cpp BFC.cpp ReadFilter.cpp SeqPlot.cpp \

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