[Pkg-scicomp-commits] atlas/trunk/debian

[Sylvestre Ledru]

SVN commit 4492 by sylvestre-guest:

* Refactor the serie of target
* custom is now calling the build target (instead of binary)

 M  +27 -17    atlas/trunk/debian/rules  


--- atlas/trunk/debian/rules #4491:4492
@@ -100,12 +100,9 @@
 		#   therefor, leaving the choice of the optimization to Atlas
 		# * After that, we fall back to the normal build procedure by calling
 		#   debian/rules itself (yep, recursively)
-		debian/rules ARCHS=base__ binary
+		debian/rules ARCHS=base__ build
 		touch $@
 
-build: configure-stamp build-stamp
-
-configure: configure-stamp
 configure-stamp:
 		if ! grep ^flags /proc/cpuinfo | grep -q $(CHECK_EXTENSIONS); then \
 			echo "In order to build Atlas under $(DEB_HOST_ARCH_CPU), you need the CPU extension $(CHECK_EXTENSIONS) available on your CPU"; 	\
@@ -125,7 +122,15 @@
 		touch $@
 #		(mkdir -p build/static; cd build/static; CFLAGS="$(CFLAGS)" ../../configure $(COMMON_CONFIG_PARAMS) $(STATIC_CONFIG_PARAMS))
 
-build-stamp:
+
+build: build-arch build-indep
+
+build-indep: patch build-indep-stamp
+build-indep-stamp: configure-stamp
+		touch $@
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
 		dh_testdir
 		for ext in $(ARCHS); do					\
 			targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`;		\
@@ -145,10 +150,6 @@
 	mv $(CURDIR)/debian/tmp/usr/lib/atlas/libcblas* $(CURDIR)/debian/tmp/usr/lib/ 
 
 
-# Everything is built in the "build" target
-build-arch:  build-stamp
-build-indep: build-stamp
-
 check: build
 		-$(MAKE) check 
 		touch $@
@@ -157,12 +158,19 @@
 clean-work:
 		dh_testdir
 		dh_testroot
-		rm -rf build check configure-stamp build-stamp
+		rm -rf build check 
+		rm -f build-arch-stamp build-indep-stamp
+		rm -f install-arch-stamp install-indep-stamp configure-stamp
+
 		[ ! -f Makefile ] || $(MAKE) distclean
 		# some additional cleanups
 		dh_clean 
 
-install-indep: build-indep check
+
+install: install-arch install-indep
+
+install-indep: install-indep-stamp
+install-indep-stamp: build-indep-stamp
 		dh_testdir
 		dh_testroot
 		dh_clean -k -i 
@@ -173,10 +181,11 @@
 			make DESTDIR=$(DEB_DESTDIR) install; 		\
 			cd -;										\
 		done
-
 #		dh_install -i --sourcedir=$(CURDIR)/debian/atlas
+		touch $@
 
-install-arch: build-arch check
+install-arch: install-arch-stamp
+install-arch-stamp: build-arch-stamp
 		dh_testdir
 		dh_testroot
 #		dh_clean -k -s 
@@ -188,8 +197,11 @@
 #		find debian/libatlas-dev/ -type f -name '*\.so*' -exec chrpath -d '{}' \;
 #		sed -i 's/3Atlas/3/' debian/atlas/usr/share/man/man3/*.3
 #		dh_install -s --sourcedir=$(CURDIR)/debian/atlas --list-missing
+		touch $@
 
-binary-indep: install-indep
+binary: binary-indep binary-arch
+
+binary-indep: install-indep-stamp
 		dh_testdir -i
 		dh_testroot -i
 		dh_installchangelogs  -i
@@ -208,7 +220,7 @@
 		dh_md5sums -i
 		dh_builddeb -i
 
-binary-arch: install-arch
+binary-arch: install-arch-stamp
 		dh_testdir -a
 		dh_testroot -a
 		dh_installchangelogs  -a
@@ -229,8 +241,6 @@
 #		dh_md5sums -a
 #		dh_builddeb -a
 
-binary: binary-indep binary-arch 
-
 .PHONY: binary binary-arch binary-indep build-arch build-indep clean install-indep install-arch
 
 get-orig-source: