[nfft] 03/08: meta-commit:

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository nfft.

commit 6703cfd1d746d9df147826d1aea5bf046931ed12
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Oct 13 11:07:21 2015 +0100

    meta-commit:
    
      * split rules into -arch and -indep, documentation is now built in indep,
      * explicitly call dh_installdocs and dh_doxygen for installing the docs,
      * use stricter hardening,
      * test for nocheck in testing rule.
---
 debian/libnfft3-doc.docs |   1 -
 debian/rules             | 108 ++++++++++++++++++++++++++++-------------------
 2 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/debian/libnfft3-doc.docs b/debian/libnfft3-doc.docs
deleted file mode 100644
index 239475a..0000000
--- a/debian/libnfft3-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-nfft/doc/html
diff --git a/debian/rules b/debian/rules
index e069e78..051fb86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,59 +1,81 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
 DH_VERBOSE = 1
 
+# Hardening flags.
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+# Build options common to arch and indep targets.
+COMMON_BUILD_OPTIONS = \
+	--disable-applications \
+	--disable-examples \
+	--disable-static \
+	--enable-all \
+	--enable-openmp
+
 %:
 	dh $@ --parallel --with autoreconf \
 		--dbg-package=libnfft3-dbg
 
-override_dh_auto_configure:
-	sh ./bootstrap.sh
-	dh_auto_configure --builddirectory=nfft -- \
-		--disable-static \
-		--enable-all \
-		--enable-openmp \
-		--disable-applications \
-		--disable-examples
-	dh_auto_configure --builddirectory=nfftf -- \
-		--disable-static \
-		--enable-all \
-		--enable-openmp \
-		--disable-applications \
-		--disable-examples \
-		--enable-single \
-		--program-suffix=f \
+override_dh_auto_clean-arch:
+	dh_auto_clean --arch --builddirectory=build-nfft
+	dh_auto_clean --arch --builddirectory=build-nfftf
+	dh_auto_clean --arch --builddirectory=build-nfftl
+
+override_dh_auto_clean-indep:
+	dh_auto_clean --indep --builddirectory=build-indep
+
+override_dh_auto_configure-arch:
+	dh_auto_configure --builddirectory=build-nfft -- \
+		$(COMMON_BUILD_OPTIONS) \
 		--disable-doxygen-doc
-	dh_auto_configure --builddirectory=nfftl -- \
-		--disable-static \
-		--enable-all \
-		--enable-openmp \
-		--disable-applications \
-		--disable-examples \
+	dh_auto_configure --builddirectory=build-nfftf -- \
+		$(COMMON_BUILD_OPTIONS) \
+		--disable-doxygen-doc \
+		--enable-single \
+		--program-suffix=f
+	dh_auto_configure --builddirectory=build-nfftl -- \
+		$(COMMON_BUILD_OPTIONS) \
+		--disable-doxygen-doc \
 		--enable-long-double \
-		--program-suffix=l \
-		--disable-doxygen-doc
+		--program-suffix=l
+
+override_dh_auto_configure-indep:
+	dh_auto_configure --builddirectory=build-indep -- \
+		$(COMMON_BUILD_OPTIONS) \
+		--enable-doxygen-doc
 
-override_dh_auto_build:
-	dh_auto_build --builddirectory=nfft
-	dh_auto_build --builddirectory=nfftf
-	dh_auto_build --builddirectory=nfftl
-	# make documentation in nfft build tree
-	cd $(CURDIR)/nfft && make doc
+override_dh_auto_build-arch:
+	dh_auto_build --arch --builddirectory=build-nfft
+	dh_auto_build --arch --builddirectory=build-nfftf
+	dh_auto_build --arch --builddirectory=build-nfftl
 
-override_dh_auto_clean:
-	dh_auto_clean --builddirectory=nfft
-	dh_auto_clean --builddirectory=nfftf
-	dh_auto_clean --builddirectory=nfftl
-	# clean main tree
-	#dh_auto_clean --builddirectory=$(CURDIR)
+override_dh_auto_build-indep:
+	cd $(CURDIR)/build-indep && make doc
 
 override_dh_auto_install-arch:
-	dh_auto_install --builddirectory=nfft --package=libnfft3-double2
-	dh_auto_install --builddirectory=nfftf --package=libnfft3-single2
-	dh_auto_install --builddirectory=nfftl --package=libnfft3-long2
+	dh_auto_install --arch --builddirectory=build-nfft \
+		--package=libnfft3-double2
+	dh_auto_install --arch --builddirectory=build-nfftf \
+		--package=libnfft3-single2
+	dh_auto_install --arch --builddirectory=build-nfftl \
+		--package=libnfft3-long2
+
+override_dh_auto_install-indep:
+	# Nothing to do here.
+
+override_dh_installdocs-arch:
+	dh_installdocs --arch
+
+override_dh_installdocs-indep:
+	dh_installdocs --indep $(CURDIR)/build-indep/doc/html
+	dh_doxygen --indep
 
-override_dh_auto_test:
-	dh_auto_test --builddirectory=nfft
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_test-arch:
 	# only test double, otherwise too long
-	#dh_auto_test --builddirectory=nfftf
-	#dh_auto_test --builddirectory=nfftl
+	dh_auto_test --builddirectory=build-nfft
+endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nfft.git