[silo-llnl] 75/96: Need Qt5Core library

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

    Need Qt5Core library
---
 debian/rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 65b3603..6a7aa1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ endif
 # QT version 4 or 5
 QT:=qt5
 
+DEFAULT_PYTHON:=`py3versions -d`
 PYVERS:= `pyversions -s`
 PY3VERS:= `py3versions -s`
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -38,14 +39,15 @@ override_dh_autoreconf:
 
 override_dh_auto_configure:
 	LDFLAGS="$(LDFLAGS)" dh_auto_configure -- \
-		--enable-versioned-symbol --enable-silex --enable-pythonmodule \
+		--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)"  
+		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 "
 
 override_dh_auto_build:
-	$(MAKE) CC=$(CC) CXX=$(CXX) PYTHON=$$p 
+	$(MAKE) -C tools/browser CC=$(CC) CXX=$(CXX)
+	$(MAKE) -C tools/silock CC=$(CC) CXX=$(CXX)
 	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