[getfem] 05/05: Simplify debian/rules.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository getfem.

commit d7c875f3d76c4546d30a2f413d1579cfb8f469a3
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Sep 14 19:20:09 2013 +0200

    Simplify debian/rules.
---
 debian/control |    3 ++-
 debian/rules   |   44 +++++++-------------------------------------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index d3e8245..b640158 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends:
  debhelper (>= 9),
  dh-autoreconf,
  libblas-dev,
- libboost-dev,
+ libboost-all-dev,
+ libmetis-dev,
  libmumps-seq-dev [!s390x],
  libmuparser-dev [!hurd-i386],
  libqhull-dev,
diff --git a/debian/rules b/debian/rules
index 8088720..bf70306 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,6 @@
 	dh $@ --with python2 --parallel --with autoreconf
 
 #=====================================================================
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
 
 export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
 export CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
@@ -23,12 +13,10 @@ export LD_LIBRARY_PATH :=$(LD_LIBRARY_PATH):$(CURDIR)/./src/.libs/
 
 configure_flags= $(CROSS) --prefix=/usr \
 		--enable-boost --enable-shared --with-pic \
-		--enable-python \
-		--disable-matlab --disable-superlu --enable-scilab\
-		CFLAGS="$(CFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS)" \
-		CPPFLAGS="$(CPPFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" 
+		--enable-python --enable-metis \
+		--disable-matlab --disable-superlu \
+		--enable-muparser --enable-mumps \
+		--with-mumps="-lsmumps_seq -ldmumps_seq -lcmumps_seq -lzmumps_seq -lpord_seq"  
 
 disable_scilab_archs   = mips kfreebsd-amd64 kfreebsd-i386 s390x hurd-i386
 ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_scilab_archs)))
@@ -37,28 +25,11 @@ else
 	configure_flags += --enable-scilab --with-scilab-toolbox-dir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/scilab-getfem++/
 endif
 
-disable_muparser_archs = hurd-i386
-ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_muparser_archs)))
-	configure_flags += --disable-muparser
-else
-	configure_flags += --enable-muparser 
-endif
 
-disable_mumps_archs = s390x
-ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_mumps_archs)))
-	configure_flags += --disable-mumps
-else
-	configure_flags += --enable-mumps --with-mumps="-lsmumps_seq -ldmumps_seq -lcmumps_seq -lzmumps_seq -lpord_seq"  
-endif
-
-
-# shared library versions, option 1
-version=4.2
-major=5
 #=====================================================================
 
 override_dh_auto_configure:
-	dh_auto_configure --	$(configure_flags)
+	dh_auto_configure -- $(configure_flags)
 
 override_dh_auto_build:
 	dh_auto_build
@@ -83,8 +54,7 @@ override_dh_installchangelogs:
 override_dh_strip-arch:
 	dh_strip -a --dbg-package=libgetfem++-dbg
 
-override_dh_auto_test:
-	PYTHONPATH=$(CURDIR)/interface/src/python/ dh_auto_test
-
 override_dh_python2:
 	dh_python2 --no-guessing-versions
+
+override_dh_auto_test:

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