r45681 - /packages/gmsh-tetgen/trunk/debian/rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Tue Mar 26 10:31:36 2013
New Revision: 45681

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45681
Log:
update rules

Modified:
    packages/gmsh-tetgen/trunk/debian/rules

Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=45681&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Tue Mar 26 10:31:36 2013
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 BUILDDIR = $(CURDIR)/debian/build
 JAVA_HOME=/usr/lib/jvm/default-java
-
-DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
@@ -15,13 +13,7 @@
 export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
 disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
-export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH); 
-
-#extra_flags += \
-#-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
-#                  -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-#-DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
-#-DCMAKE_LD_FLAGS="-Wl,--no-as-needed -fPIC -Wall $(shell dpkg-buildflags --get LDFLAGS)" \
+export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH):$(LD_LIBRARY_PATH); 
 
 extra_flags += \
 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
@@ -36,6 +28,7 @@
 -DENABLE_WRAP_PYTHON:BOOL=ON \
 -DENABLE_WRAP_JAVA:BOOL=ON \
 -DENABLE_ONELAB:BOOL=ON \
+-DENABLE_BUILD_SHARED:BOOL=ON \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
 -DINSTALL_LIB_DIR:STRING="/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -82,15 +75,9 @@
 override_dh_auto_build:
 	dh_auto_build
 	
-	# Buil onelab
-	#make -C $(CURDIR)/projects/onelab/SOLVERS STATICLINUX=$(DEB_HOST_ARCH_BITS) GMSH_DIR=$(CURDIR)
-	#export GMSH_DIR=''
-	
 	# To avoid the texi2dvi pb add LC_ALL=C
 	dh_auto_build -- pdf html info LC_ALL=C
 	chrpath -d $(BUILDDIR)/wrappers/gmshpy/*.so
-	#jh_installlibs -pjava-gmsh-tetgen -v
-	#h_depends -pjava-gmsh-tetgen -v
 
 override_dh_auto_test:
 	mkdir test-dir