[med-svn] [relion] 09/36: d/rules: Make separate build for GUI to prevent useless libs linked in

[Roland Fehrenbacher]

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

rfehren-guest pushed a commit to branch master
in repository relion.

commit 4d29578f612e7951f5eef0b2ab6d09e807047ffd
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Fri Oct 10 21:45:36 2014 +0000

    d/rules: Make separate build for GUI to prevent useless libs linked in
---
 debian/rules | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index a981c7f..8fa82f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,16 @@ CONFIGURE_COMMON := ./configure --prefix=/usr \
 override_dh_auto_configure:
 
 override_dh_auto_build:
-	# First configure/build/install serial version
-	MPICXX=$(MPICXX) $(CONFIGURE_COMMON) --enable-mpi --disable-gui
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr; make clean
-	make clean
+	# First configure/build/install GUI version
 	$(CONFIGURE_COMMON) --enable-gui \
 	  CPPFLAGS="$$(fltk-config --cxxflags)" \
 	  LDFLAGS="$$(fltk-config --ldflags)"
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr; make clean
+	# ... then clitools ...
+	$(CONFIGURE_COMMON) --disable-gui
+	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr; make clean
+	# ... then mpitools ...
+	MPICXX=$(MPICXX) $(CONFIGURE_COMMON) --enable-mpi --disable-gui
 	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr
 
 override_dh_prep:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git