[silo-llnl] 76/96: Also need to build in ./src but not ./tools/silex

[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 1ba5b1d20302f86e853f898cf545b64476a04352
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 19:59:15 2014 +0100

    Also need to build in ./src but not ./tools/silex
---
 debian/rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6a7aa1f..0ce27b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,16 +38,17 @@ override_dh_autoreconf:
 # -Wl,--as-needed removed from LDFLAGS for the moment.
 
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS)" dh_auto_configure -- \
+	dh_auto_configure -- \
 		--enable-versioned-symbol --enable-pythonmodule \
 		--with-hdf5=/usr/include,/usr/lib \
 		--with-Qt-bin=$(QT_BINDIR) --with-Qt-include-dir=/usr/include/$(QT) -with-Qt-lib=Qt5Widgets \
-		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " CXXFLAGS="$(CXXFLAGS) -fPIC " \
-		CPPFLAGS=" -I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  LIBS=" -lQt5Core "
+		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " CXXFLAGS="$(CXXFLAGS) -fPIC " LIBS=" -lQt5Core \
+		LIBS=" -lQt5Core " LDFLAGS=$(LDFLAGS)" \
+		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:
-	$(MAKE) -C tools/browser CC=$(CC) CXX=$(CXX)
-	$(MAKE) -C tools/silock CC=$(CC) CXX=$(CXX)
+	for d in src tools/browser tools/silcock ; do \
+		$(MAKE) -C $$d CC=$(CC) CXX=$(CXX) ; done
 	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 ;  \

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