[Pkg-openmpi-commits] r141 - in /openmpi/trunk/debian: libopenmpi-dev.install rules

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

Author: sylvestre-guest
Date: Sun Oct 19 22:07:00 2008
New Revision: 141

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=141
Log:
small and cleaner

Modified:
    openmpi/trunk/debian/libopenmpi-dev.install
    openmpi/trunk/debian/rules

Modified: openmpi/trunk/debian/libopenmpi-dev.install
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/libopenmpi-dev.install?rev=141&op=diff
==============================================================================
--- openmpi/trunk/debian/libopenmpi-dev.install (original)
+++ openmpi/trunk/debian/libopenmpi-dev.install Sun Oct 19 22:07:00 2008
@@ -1,8 +1,6 @@
 usr/bin/opal_wrapper
 usr/lib/openmpi/include/*
 usr/lib/openmpi/lib/*.so
-usr/lib/openmpi/lib/*.a
-usr/lib/openmpi/lib/*.la
 usr/share/man/man1/mpicc.openmpi.1
 usr/share/man/man1/mpic++.openmpi.1
 usr/share/man/man1/mpicxx.openmpi.1

Modified: openmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/rules?rev=141&op=diff
==============================================================================
--- openmpi/trunk/debian/rules (original)
+++ openmpi/trunk/debian/rules Sun Oct 19 22:07:00 2008
@@ -35,20 +35,22 @@
 			--libdir=\$${prefix}/lib/openmpi/lib	\
 			--includedir=\$${prefix}/lib/openmpi/include	\
 			--with-devel-headers
+
 # Thread support disabled because it's broken, see bug #435581
 #                       --enable-mpi-threads                    \
 #                       --enable-progress-threads
 
 # Flags for the static build: see bug #502232
 STATIC_CONFIG_PARAMS = --enable-static
-configure: patch-stamp configure-stamp
-configure-stamp: patch-stamp
+
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
 	(mkdir -p build/basic; cd build/basic; CFLAGS="$(CFLAGS)" ../../configure $(COMMON_CONFIG_PARAMS))
 	(mkdir -p build/static; cd build/static; CFLAGS="$(CFLAGS)" ../../configure $(COMMON_CONFIG_PARAMS) $(STATIC_CONFIG_PARAMS))
 	touch $@
 
-build: patch-stamp configure-stamp build-basic build-static
+build: configure-stamp build-basic build-static
 
 build-basic:
 	dh_testdir
@@ -79,35 +81,21 @@
 	rm -rf opal/libltdl/.libs 
 	dh_clean 
 
-install: build install-static install-basic
-	dh_testdir
-	dh_testroot
-
-install-static: build
-	dh_testdir
-	dh_testroot
-	dh_clean -plibopenmpi-dev -k
-	dh_installdirs -plibopenmpi-dev
-	$(MAKE) -C build/static install DESTDIR=$(CURDIR)/debian/libopenmpi-dev
-	# Remove everything but the lib
-	rm -rf $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/include/ $(CURDIR)/debian/libopenmpi-dev/etc/ $(CURDIR)/debian/libopenmpi-dev/usr/share/ $(CURDIR)/debian/libopenmpi-dev/usr/bin/
-
-install-basic: build
-	dh_testdir
-	dh_testroot
-	$(MAKE) -C build/basic install DESTDIR=$(CURDIR)/debian/tmp/
-
-install-indep: build-indep check install
+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: build-arch check install
+install-arch: build-arch check
 	dh_testdir
 	dh_testroot
 	dh_clean -k -s 
+	$(MAKE) -C build/static install DESTDIR=$(CURDIR)/debian/libopenmpi-dev/
+	$(MAKE) -C build/basic install DESTDIR=$(CURDIR)/debian/openmpi/
+	rm -rf $(CURDIR)/debian/libopenmpi-dev/usr/lib/openmpi/include/ $(CURDIR)/debian/libopenmpi-dev/etc/ $(CURDIR)/debian/libopenmpi-dev/usr/share/ $(CURDIR)/debian/libopenmpi-dev/usr/bin/
+
 
 	# Strip rpath info from all executables and libraries
 	find debian/openmpi/ -type f -perm -+x -a ! -name '*.la' -a ! -name '*.mod' -exec chrpath -d '{}' \;