[silo-llnl] 71/96: Make python stuff several times; rest once only

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 1b3a7a62ba36698cddd6583dbf68c1d60faa38f1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 15:16:27 2014 +0100

    Make python stuff several times; rest once only
---
 debian/control |  2 +-
 debian/rules   | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 40fc76e..ffa1e51 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, 
   gfortran, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, 
   dh-autoreconf (>= 4~), python3-dev, python3-all-dev,
-  qbase5-dev
+  qtbase5-dev
 Build-Conflicts: qt3-dev-tools, qt4-dev-tools
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
diff --git a/debian/rules b/debian/rules
index e2b75eb..1aff8b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # magic debhelper rule
 %:
@@ -40,17 +40,9 @@ override_dh_auto_configure:
 		CPPFLAGS=" -I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  
 
 override_dh_auto_build:
-	dh_auto_build
-	set -e ; for p in $(PYVERS) ; do   \
-		 LDFLAGS="$(LDFLAGS)" dh_auto_configure -- \
-			--enable-pythonmodule --enable-silex --enable-versioned-symbol \
-			--with-hdf5=/usr/include,/usr/lib \
-			--with-Qt=/usr --with-Qt-bin=$(QT_BINDIR) --with-Qt-include=/usr/include/$(QT) \
-			PYTHON=$$p CPPFLAGS=" -I/usr/include/$(QT)/QtWidgets  -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC) CXX=$(CXX)  \
-			CFLAGS="$(CFLAGS) -fPIC" ; \
-		$(MAKE) CC=$(CC) CXX=$(CXX) ;\
-		$(MAKE) -C tools/browser CC=$(CC) CXX=$(CXX) ;\
-		$(MAKE) -C tools/python CC=$(CC) CXX=$(CXX) ; \
+	$(MAKE) CC=$(CC) CXX=$(CXX) PYTHON=$$p 
+	set -e ; for p in $(PYVERS)  ; do   \
+		$(MAKE) -C tools/python clean all CC=$(CC) CXX=$(CXX) PYTHON=$$p; \
 		mkdir -p  debian/tmp/usr/lib/pyshared/$$p ;  \
 		cp tools/python/.libs/Silo.so debian/Silo.so.$$p  ; \
 	done

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