[med-svn] [kmer-tools] 02/03: Make package only build the meryl subcomponent

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository kmer-tools.

commit 8cc44243177dd177b0bc77de65b78743136a7399
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Thu May 21 02:19:16 2015 -0700

    Make package only build the meryl subcomponent
    
    The other components of the k-mer suite require some additional
    clean-up according to upstream. Meryl is the only component
    necessary for wgs-assembler among the suite, so it may be
    packaged separately. The kazlib patch somewhat undoes another
    quilt patch, but it is only temporary for as long as the
    remaining components of k-mer are ignored.
---
 debian/patches/remove-kazlib.patch | 13 +++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  7 ++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/patches/remove-kazlib.patch b/debian/patches/remove-kazlib.patch
new file mode 100644
index 0000000..62a6a1f
--- /dev/null
+++ b/debian/patches/remove-kazlib.patch
@@ -0,0 +1,13 @@
+--- kmer-tools.orig/configure.sh
++++ kmer-tools/configure.sh
+@@ -369,8 +369,8 @@
+ CXXLD             := \${CXX}
+ CCDEP		  := gcc -MM -MG
+ CXXDEP	          := g++ -MM -MG
+-CLIBS             += -lm -lbz2 -lkaz
+-CXXLIBS           += -lm -lbz2 -lkaz
++CLIBS             += -lm -lbz2
++CXXLIBS           += -lm -lbz2
+ PYTHON            := $PYTHON
+ PYTHON_H          := $CFLAGS_PYTHON/Python.h
+ CFLAGS_PYTHON     := -I$CFLAGS_PYTHON
diff --git a/debian/patches/series b/debian/patches/series
index 7e2ebf2..4fad957 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kazlib.patch
+remove-kazlib.patch
diff --git a/debian/rules b/debian/rules
index 74b6ed3..ffe4281 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,18 @@ include /usr/share/dpkg/default.mk
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+# The trailing slashes are very important to the build system
+subdirectories:= $(filter-out debian/, $(shell ls -d */))
+meryl:= libbio/ libkmer/ libmeryl/ libseq/ libutil/ meryl/
+
 
 # main packaging script based on dh7 syntax
 %:
 	dh $@ 
 
 override_dh_auto_build:
-	$(MAKE) install && ln -sf $(shell uname)-* installdir
+	$(MAKE) WITHOUT="$(filter-out $(meryl), $(subdirectories))" install
+	ln -sf $(shell uname)-* installdir
 
 override_dh_auto_clean:
 	$(MAKE) real-clean

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