[med-svn] [iqtree] 01/03: Patches provided by Christian Seiler <christian at iwakd.de> to enhance build process and fix test

[Andreas Tille]

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

tille pushed a commit to branch master
in repository iqtree.

commit c867ed1da4cabf40370c9f96d948069e5d1db729
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 29 13:29:39 2016 +0200

    Patches provided by Christian Seiler <christian at iwakd.de> to enhance build process and fix test
---
 debian/rules | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/debian/rules b/debian/rules
index dfc8ec1..2fb3a0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,27 +5,31 @@
 pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
 mandir=$(CURDIR)/debian/$(pkg)/usr/share/man/man1/
-tmpompdir=$(CURDIR)/debian/tmp-omp/usr/bin
 
 %:
-	dh $@
+	dh $@ --parallel
 
-# Build first with OMP multiprocessing
-override_dh_auto_configure:
-	dh_auto_configure -- -DIQTREE_FLAGS="omp"
+VARIANTS = omp serial
 
-override_dh_auto_build:
-	dh_auto_build
-	mkdir -p $(tmpompdir)
-	cp -a `find $(CURDIR) -name iqtree-omp -type f -executable` $(tmpompdir)
-	# build again without OMP
-	dh_auto_clean
-	dh_auto_configure
-	dh_auto_build
+override_dh_auto_configure: $(foreach variant,$(VARIANTS),dh_auto_configure_$(variant))
+override_dh_auto_build:     $(foreach variant,$(VARIANTS),dh_auto_build_$(variant))
+override_dh_auto_install:   $(foreach variant,$(VARIANTS),dh_auto_install_$(variant))
+override_dh_auto_clean:     $(foreach variant,$(VARIANTS),dh_auto_clean_$(variant))
 
-override_dh_auto_install:
-	dh_auto_install
-	mv $(tmpompdir)/iqtree-omp debian/$(pkg)/usr/bin
+dh_auto_configure_omp:
+	dh_auto_configure -Bbuild.omp -- -DIQTREE_FLAGS="omp"
+
+dh_auto_configure_serial:
+	dh_auto_configure -Bbuild.serial -- -DIQTREE_FLAGS=""
+
+dh_auto_build_%:
+	dh_auto_build -Bbuild.$(subst dh_auto_build_,,$@)
+
+dh_auto_install_%:
+	dh_auto_install -Bbuild.$(subst dh_auto_install_,,$@)
+
+dh_auto_clean_%:
+	dh_auto_clean -Bbuild.$(subst dh_auto_clean_,,$@)
 
 override_dh_installexamples:
 	dh_installexamples
@@ -49,6 +53,6 @@ override_dh_auto_test:
 #		ln -s iqtree-omp `dirname $$iqtreeomp`/iqtree ; \
 #	fi
 	sed '/ myprefix/,$$d' debian/Documents_source/example.sh > example.short
-	echo 'time $(tmpompdir)/iqtree-omp -s example.phy -omp 2' >> example.short
+	echo 'time $(CURDIR)/build.omp/iqtree-omp -s example.phy -omp 2	-redo' >> example.short
 	time sh example.short
 	rm example.short

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