[clfft] 02/06: Install examples to doc package.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit 0a6062d80227b83935185d81c41c642b265fba2d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 25 12:20:01 2015 +0000

    Install examples to doc package.
---
 debian/libclfft-doc.install                      |  1 +
 debian/patches/Fix-examples-install-target.patch | 21 +++++++++++++++
 debian/patches/series                            |  1 +
 debian/rules                                     | 34 +++++++++++++++---------
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/debian/libclfft-doc.install b/debian/libclfft-doc.install
new file mode 100644
index 0000000..7276ecd
--- /dev/null
+++ b/debian/libclfft-doc.install
@@ -0,0 +1 @@
+usr/share/doc
diff --git a/debian/patches/Fix-examples-install-target.patch b/debian/patches/Fix-examples-install-target.patch
new file mode 100644
index 0000000..4457caa
--- /dev/null
+++ b/debian/patches/Fix-examples-install-target.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 25 Nov 2015 12:14:29 +0000
+Subject: Fix examples install target.
+
+- Disable install of examples runtime executable.
+- Inject desired examples install directory.
+---
+ src/examples/CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/src/examples/CMakeLists.txt
++++ b/src/examples/CMakeLists.txt
+@@ -47,7 +47,5 @@
+         OUTPUT_NAME ${EXAMPLE}
+         RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
+ 
+-    INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples")
+-    INSTALL(TARGETS ${EXAMPLE_NAME}
+-        RUNTIME DESTINATION "share/clFFT/examples")
++    INSTALL(FILES ${FILE} DESTINATION share/doc/libclfft-doc/examples)
+ ENDFOREACH()
diff --git a/debian/patches/series b/debian/patches/series
index 8eace2d..990a0f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-system-mathjax.patch
 reproducible-build.patch
 use-boost-dynamic-libs.patch
 restore-missing-install-targets.patch
+Fix-examples-install-target.patch
diff --git a/debian/rules b/debian/rules
index cd23d35..a473ab8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,34 +7,39 @@
 # Hardening flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # Environment information.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# Common build options.
+CMAKE_BUILD_OPTIONS = \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DBUILD_RUNTIME=ON \
+	-DBUILD_CLIENT=ON \
+	-DBUILD_TEST=OFF \
+	-DBUILD_LOADLIBRARIES=OFF \
+	-DBUILD_SHARED_LIBS=ON \
+	-DSUFFIX_LIB=/${DEB_HOST_MULTIARCH}
+
 %:
 	dh $@ --parallel \
 		--sourcedirectory=src \
 		--dbg-package=libclfft2-dbg
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DBUILD_RUNTIME=ON \
-		-DBUILD_CLIENT=ON \
-		-DBUILD_TEST=OFF \
-		-DBUILD_LOADLIBRARIES=OFF \
-		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_EXAMPLES=OFF \
-		-DSUFFIX_LIB=/${DEB_HOST_MULTIARCH}
+override_dh_auto_configure-arch:
+	dh_auto_configure -- ${CMAKE_BUILD_OPTIONS} \
+		-DBUILD_EXAMPLES=OFF
+
+override_dh_auto_configure-indep:
+	dh_auto_configure -- ${CMAKE_BUILD_OPTIONS} \
+		-DBUILD_EXAMPLES=ON
 
 override_dh_auto_build-indep:
 	echo "I: Generating Doxygen documentation"
 	cd docs/ && doxygen clFFT.doxy
 
-override_dh_auto_install-indep:
-	# Pass.
-
 override_dh_auto_clean-indep:
 	rm -rf docs/html
 	rm -f docs/doxygen_sqlite3.db
@@ -42,3 +47,6 @@ override_dh_auto_clean-indep:
 override_dh_installdocs-indep:
 	dh_installdocs --indep
 	dh_doxygen --indep
+
+override_dh_compress:
+	dh_compress --exclude=examples

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