[arrayfire] 01/04: d/rules: simplify targets.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Nov 19 09:49:32 UTC 2015


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

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

commit f4d970869ef3725cbaa61ad87288a44b0df8b334
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 18 09:33:40 2015 +0000

    d/rules: simplify targets.
---
 debian/rules | 42 +++++++++---------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/debian/rules b/debian/rules
index 26713ac..e76fa67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,11 +15,14 @@ CMAKE_BUILD_OPTIONS = \
 	-DAF_INSTALL_CMAKE_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/ArrayFire \
 	-DAF_INSTALL_LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	-DAF_INSTALL_INCLUDE_DIR=/usr/include \
+	-DBUILD_CPU=ON \
 	-DBUILD_CUDA=OFF \
 	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_GRAPHICS=OFF \
+	-DBUILD_GTEST=ON \
 	-DBUILD_NONFREE=OFF \
 	-DBUILD_OPENCL=OFF \
+	-DBUILD_TEST=ON \
 	-DBUILD_UNIFIED=OFF \
 	-DWITH_COVERAGE=OFF
 
@@ -29,47 +32,20 @@ CTEST_EXCLUDE_REGEX = large|dense
 %:
 	dh $@ --parallel
 
-override_dh_auto_clean-arch:
-	dh_auto_clean --arch --builddirectory=build-arch
-	# Remove auto-generated files.
-	find $(CURDIR) -name "version.h" -delete
-
-override_dh_auto_clean-indep:
-	dh_auto_clean --indep --builddirectory=build-indep
+override_dh_auto_clean:
+	dh_auto_clean
 	# Remove auto-generated files.
 	find $(CURDIR) -name "version.h" -delete
 
 override_dh_auto_configure-arch:
-	dh_auto_configure --builddirectory=build-arch -- \
-		$(CMAKE_BUILD_OPTIONS) \
-		-DBUILD_CPU=ON \
-		-DBUILD_DOCS=OFF \
-		-DBUILD_GTEST=ON \
-		-DBUILD_TEST=ON
+	dh_auto_configure -- $(CMAKE_BUILD_OPTIONS) -DBUILD_DOCS=OFF
 
 override_dh_auto_configure-indep:
-	dh_auto_configure --builddirectory=build-indep -- \
-		$(CMAKE_BUILD_OPTIONS) \
-		-DBUILD_CPU=OFF \
-		-DBUILD_DOCS=ON \
-		-DBUILD_GTEST=OFF \
-		-DBUILD_TEST=OFF
-
-override_dh_auto_build-arch:
-	dh_auto_build --arch --builddirectory=build-arch
-
-override_dh_auto_build-indep:
-	dh_auto_build --indep --builddirectory=build-indep
-
-override_dh_auto_install-arch:
-	dh_auto_install --arch --builddirectory=build-arch
-
-override_dh_auto_install-indep:
-	dh_auto_install --indep --builddirectory=build-indep 
+	dh_auto_configure -- $(CMAKE_BUILD_OPTIONS) -DBUILD_DOCS=ON
 
-override_dh_auto_test-arch:
+override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cd build-arch && \
+	cd obj-* && \
 	CTEST_OUTPUT_ON_FAILURE=1 ctest --force-new-ctest-process -R "cpu" \
 		-E "$(CTEST_EXCLUDE_REGEX)"
 endif

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



More information about the debian-science-commits mailing list