[med-svn] [khmer] 02/02: use pkg-config in autopkgtest

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository khmer.

commit f6c541210a287da5eddb69c1f83af4107969cefe
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sun Jan 15 13:09:53 2017 +0000

    use pkg-config in autopkgtest
    
    This is probably what most devs will want to use when
    developing against liboxli.
---
 debian/tests/control          |  2 +-
 debian/tests/test-liboxli-dev | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 18c84a2..809fd67 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: run-unit-test
        test-liboxli-dev
-Depends: khmer,python3-nose,build-essential,zlib1g-dev,libbz2-dev,liboxli-dev
+Depends: khmer,python3-nose,build-essential,pkg-config,zlib1g-dev,libbz2-dev,liboxli-dev
 Restrictions: allow-stderr
diff --git a/debian/tests/test-liboxli-dev b/debian/tests/test-liboxli-dev
index adf0e35..bcf2ac4 100644
--- a/debian/tests/test-liboxli-dev
+++ b/debian/tests/test-liboxli-dev
@@ -6,16 +6,13 @@ if [ "$ADTTMP" = "" ] ; then
 fi
 cd $ADTTMP
 
-c++ -o test-prog-static -std=c++11\
-    /usr/share/doc/khmer-common/test-compile.cc \
-    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/liboxli.a \
-    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libz.a \
-    /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libbz2.a
+c++ -o test-prog-static -static -std=c++11 `pkg-config oxli --static --cflags` \
+  /usr/share/doc/khmer-common/test-compile.cc `pkg-config oxli --static --libs`
 
 ./test-prog-static
 
-c++ -o test-prog-dynamic -std=c++11 \
-	/usr/share/doc/khmer-common/test-compile.cc -loxli
+c++ -o test-prog-dynamic -std=c++11 `pkg-config oxli --cflags` \
+	/usr/share/doc/khmer-common/test-compile.cc `pkg-config oxli --libs`
 
 ./test-prog-dynamic
 

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