[Pkg-openmpi-commits] r94 - in /openmpi/trunk/debian: changelog rules

[hauro-guest at users.alioth.debian.org]

Author: hauro-guest
Date: Sun Dec 23 21:16:04 2007
New Revision: 94

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=94
Log:
Adjusted targets in debian/rules to be more sane.
Renamed "test" target to "check" for consistancy.

Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=94&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Sun Dec 23 21:16:04 2007
@@ -10,8 +10,10 @@
     - debian/rules, debian/control: Added chrpath to Build-Depends and
       deleting all rpath info with chrpath in install-arch target. This
       fixes all binary-or-shlib-defines-rpath warnings.
-
- -- Manuel Prinz <debian at pinguinkiste.de>  Sun, 23 Dec 2007 17:28:39 +0100
+  * debian/rules: Adjusted target dependancies to something more sane.
+    Renamed "test" target to "check".
+
+ -- Manuel Prinz <debian at pinguinkiste.de>  Sun, 23 Dec 2007 22:05:50 +0100
 
 openmpi (1.2.4-5) unstable; urgency=low
 

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=94&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Sun Dec 23 21:16:04 2007
@@ -26,8 +26,7 @@
 	CFLAGS += -mcpu=v9
 endif
 
-configure: patch configure-stamp
-configure-stamp: 
+config.status: patch-stamp
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure 				\
 			$(CROSS)				\
@@ -41,45 +40,38 @@
 # Thread support disabled because it's broken, see bug #435581
 #			--enable-mpi-threads 			\
 #			--enable-progress-threads
-	touch configure-stamp
 
-build: patch configure build-arch build-indep
+build: config.status
+	$(MAKE)
+	touch $@
 
-build-arch: build-arch-stamp
-build-arch-stamp: patch-stamp configure-stamp
-	$(MAKE) 
-	touch build-arch-stamp
+# Everything is built in the "build" target
+build-arch:  build
+build-indep: build
 
-build-indep: build-indep-stamp
-build-indep-stamp:  configure-stamp
-        #$(MAKE) doc
-	touch build-indep-stamp
-
-test: test-stamp
-test-stamp: build-arch-stamp build-indep-stamp
+check: build
 	-$(MAKE) check 
-	touch test-stamp
+	touch $@
 
 clean: clean-work unpatch
 clean-work:
 	dh_testdir
 	dh_testroot
-	rm -rf build-arch-stamp build-indep-stamp configure-stamp test-stamp debian/openmpi 
+	rm -rf build check debian/openmpi
 	xargs rm -f < debian/clean_symlinks
 	[ ! -f Makefile ] || $(MAKE) distclean
         # some additional cleanups
 	rm -rf opal/libltdl/.libs 
 	dh_clean 
 
-install: test install-arch install-indep 
-install-indep:
+install-indep: build-indep check
 	dh_testdir
 	dh_testroot
 	dh_clean -k -i 
 	dh_installdirs -i
 	dh_install -i --sourcedir=$(CURDIR)/debian/openmpi
 
-install-arch:
+install-arch: build-arch check
 	dh_testdir
 	dh_testroot
 	dh_clean -k -s 
@@ -97,7 +89,7 @@
 	sed -i 's/3OpenMPI/3/' debian/openmpi/usr/share/man/man3/*.3
 	dh_install -s --sourcedir=$(CURDIR)/debian/openmpi --list-missing
 
-binary-indep: build-indep install-indep
+binary-indep: install-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs  -i
@@ -115,7 +107,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build-arch install-arch
+binary-arch: install-arch
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs  -a
@@ -134,4 +126,5 @@
 	dh_builddeb -a
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch configure 
+
+.PHONY: binary binary-arch binary-indep build-arch build-indep clean install-arch install-indep