[getfem] 02/05: Remove some old patches.

Anton Gladky gladk at alioth.debian.org
Sat Sep 14 17:19:51 UTC 2013


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

gladk pushed a commit to branch master
in repository getfem.

commit 7cf02a96976bfdfaa5d0fd18a98917a26e894ab4
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Sep 14 19:17:10 2013 +0200

    Remove some old patches.
---
 debian/patches/addgetfempath.diff         |   14 -
 debian/patches/disableXaccess.diff        |   17 -
 debian/patches/disable_some_tests.patch   |  121 -----
 debian/patches/fix_FTBFS_topsrc.patch     |  822 -----------------------------
 debian/patches/fix_mumps_error.patch      |   72 ---
 debian/patches/ld-no-add-needed.patch     |   50 --
 debian/patches/respect_nometis_flag.patch |   34 --
 debian/patches/series                     |   10 +-
 debian/patches/stream_redirect.diff       |  108 ----
 9 files changed, 2 insertions(+), 1246 deletions(-)

diff --git a/debian/patches/addgetfempath.diff b/debian/patches/addgetfempath.diff
deleted file mode 100644
index 6450fbb..0000000
--- a/debian/patches/addgetfempath.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/interface/src/scilab/etc/sci_getfem.start
-+++ b/interface/src/scilab/etc/sci_getfem.start
-@@ -15,6 +15,11 @@
- etc_tlbx  = getshortpathname(etc_tlbx);
- root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") );
- 
-+// Load the native library
-+a=ls("/usr//lib/libgetfem.so*");
-+link(a(1));
-+clear a;
-+
- //Load  functions library
- // =============================================================================
- mprintf("\tLoad macros\n");
diff --git a/debian/patches/disableXaccess.diff b/debian/patches/disableXaccess.diff
deleted file mode 100644
index 05ae56f..0000000
--- a/debian/patches/disableXaccess.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/interface/src/scilab/Makefile.am
-+++ b/interface/src/scilab/Makefile.am
-@@ -396,7 +396,7 @@
- .NOTPARALLEL: *
- 
- all:
--	@SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_builder.sce
-+	SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_builder.sce
- 
- install:
- 	$(mkinstalldirs) $(toolboxdir)/demos
-@@ -467,4 +467,4 @@
- 	@INSTALL@ -D -m 644 -t $(toolboxdir)/ $(scilabbasedir)
- 
- clean:
--	@SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_cleaner.sce
-+	SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 @SCILAB_EXE@ -nw -nb -f $(scilabbuilddir)/makefile_cleaner.sce
diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
deleted file mode 100644
index af9e09f..0000000
--- a/debian/patches/disable_some_tests.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Description: disable tests, which are unreliable on some platforms.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-05-07
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -28,7 +28,6 @@
- 	test_range_basis           \
- 	laplacian                  \
- 	laplacian_with_bricks      \
--	elastostatic               \
- 	stokes                     \
- 	helmholtz                  \
- 	plate                      \
-@@ -39,11 +38,8 @@
- 	plasticity                 \
- 	plasticity_old_brick       \
- 	dynamic_friction           \
--	bilaplacian		   \
--	heat_equation              \
- 	wave_equation 		   \
- 	cyl_slicer		   \
--	test_large_sliding_contact \
- 	test_continuation
- 
- CLEANFILES = \
-@@ -70,7 +66,6 @@
- laplacian_with_bricks_SOURCES = laplacian_with_bricks.cc
- plate_SOURCES = plate.cc
- test_interpolation_SOURCES = test_interpolation.cc
--elastostatic_SOURCES = elastostatic.cc
- stokes_SOURCES = stokes.cc
- nonlinear_elastostatic_SOURCES = nonlinear_elastostatic.cc
- nonlinear_membrane_SOURCES = nonlinear_membrane.cc
-@@ -95,12 +90,9 @@
- crack_SOURCES = crack.cc
- endif
- dynamic_friction_SOURCES = dynamic_friction.cc
--bilaplacian_SOURCES = bilaplacian.cc
--heat_equation_SOURCES = heat_equation.cc
- wave_equation_SOURCES = wave_equation.cc
- cyl_slicer_SOURCES = cyl_slicer.cc
- test_continuation_SOURCES = test_continuation.cc
--test_large_sliding_contact_SOURCES = test_large_sliding_contact.cc
- 
- 
- SUPLDFLAGS = @SUPLDFLAGS@
-@@ -127,8 +119,6 @@
- 	$(top_srcdir)/tests/test_interpolated_fem.pl      \
- 	$(top_srcdir)/tests/test_range_basis.pl           \
- 	$(top_srcdir)/tests/laplacian.pl                  \
--	$(top_srcdir)/tests/laplacian_with_bricks.pl      \
--	$(top_srcdir)/tests/elastostatic.pl               \
- 	$(top_srcdir)/tests/stokes.pl                     \
- 	$(top_srcdir)/tests/plate.pl                      \
- 	$(optpl)                                          \
-@@ -139,10 +129,7 @@
- 	$(top_srcdir)/tests/plasticity_old_brick.pl       \
- 	$(top_srcdir)/tests/helmholtz.pl                  \
- 	$(top_srcdir)/tests/schwarz_additive.pl           \
--	$(top_srcdir)/tests/bilaplacian.pl    	          \
--	$(top_srcdir)/tests/heat_equation.pl              \
- 	$(top_srcdir)/tests/wave_equation.pl   	          \
--	$(top_srcdir)/tests/test_large_sliding_contact.pl \
- 	$(top_srcdir)/tests/cyl_slicer.pl	          \
- 	$(top_srcdir)/tests/make_gmm_test.pl
- 
-@@ -156,7 +143,6 @@
- 	test_assembly.pl                   			\
- 	laplacian.pl                       			\
- 	laplacian_with_bricks.pl 	   			\
--	elastostatic.pl                    			\
- 	stokes.pl                          			\
- 	helmholtz.pl                       			\
- 	integration.pl                     			\
-@@ -176,13 +162,10 @@
- 	laplacian_with_bricks.param        			\
- 	test_range_basis.param             			\
- 	test_range_basis.pl                			\
--	bilaplacian.param                  			\
--	bilaplacian.pl                     			\
- 	plate.param                        			\
- 	plate.pl                           			\
- 	schwarz_additive.pl                			\
- 	schwarz_additive.param             			\
--	elastostatic.param                 			\
- 	stokes.param                       			\
- 	nonlinear_elastostatic.pl          			\
- 	nonlinear_membrane.pl              			\
-@@ -196,11 +179,7 @@
- 	plasticity_old_brick.param             			\
- 	nonlinear_elastostatic.param       			\
- 	test_interpolated_fem.param        			\
--	test_large_sliding_contact.pl                           \
--	test_large_sliding_contact.param                        \
- 	geo_trans_inv.param                			\
--	heat_equation.pl                   			\
--	heat_equation.param                			\
- 	wave_equation.pl                   			\
- 	wave_equation.param                			\
- 	cyl_slicer.pl                           		\
---- a/interface/tests/python/Makefile.am
-+++ b/interface/tests/python/Makefile.am
-@@ -20,7 +20,6 @@
- if BUILDPYTHON
- TESTS = 						\
- 	$(srcdir)/check_export.py			\
--	$(srcdir)/check_global_functions.py		\
- 	$(srcdir)/demo_wave.py				\
- 	$(srcdir)/demo_laplacian.py			\
- 	$(srcdir)/check_levelset.py
---- a/interface/tests/python/Makefile.in
-+++ b/interface/tests/python/Makefile.in
-@@ -236,7 +236,6 @@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	check_export.py 		\
--	check_global_functions.py	\
- 	check_levelset.py		\
- 	demo_crack.py 			\
- 	demo_fictitious_domains.py 	\
diff --git a/debian/patches/fix_FTBFS_topsrc.patch b/debian/patches/fix_FTBFS_topsrc.patch
deleted file mode 100644
index 4160419..0000000
--- a/debian/patches/fix_FTBFS_topsrc.patch
+++ /dev/null
@@ -1,822 +0,0 @@
-Description: fix FTBFS due to $(top_srcdir)
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/713626
-Last-Update: 2013-06-30
-
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -50,54 +50,54 @@
- 	bilaplacian$(EXEEXT) heat_equation$(EXEEXT) \
- 	wave_equation$(EXEEXT) cyl_slicer$(EXEEXT) \
- 	test_large_sliding_contact$(EXEEXT) test_continuation$(EXEEXT)
--TESTS = $(top_srcdir)/tests/dynamic_array.pl \
--	$(top_srcdir)/tests/dynamic_tas.pl \
--	$(top_srcdir)/tests/test_int_set.pl \
--	$(top_srcdir)/tests/test_tree_sorted.pl \
--	$(top_srcdir)/tests/poly.pl \
--	$(top_srcdir)/tests/test_small_vector.pl \
--	$(top_srcdir)/tests/test_kdtree.pl \
--	$(top_srcdir)/tests/test_rtree.pl \
--	$(top_srcdir)/tests/geo_trans_inv.pl \
--	$(top_srcdir)/tests/test_norm.pl \
--	$(top_srcdir)/tests/test_mesh.pl \
--	$(top_srcdir)/tests/test_interpolation.pl \
--	$(top_srcdir)/tests/test_mat_elem.pl \
--	$(top_srcdir)/tests/test_slice.pl \
--	$(top_srcdir)/tests/integration.pl \
--	$(top_srcdir)/tests/test_assembly.pl \
--	$(top_srcdir)/tests/test_interpolated_fem.pl \
--	$(top_srcdir)/tests/test_range_basis.pl \
--	$(top_srcdir)/tests/laplacian.pl \
--	$(top_srcdir)/tests/laplacian_with_bricks.pl \
--	$(top_srcdir)/tests/elastostatic.pl \
--	$(top_srcdir)/tests/stokes.pl $(top_srcdir)/tests/plate.pl \
--	$(am__EXEEXT_2) $(top_srcdir)/tests/nonlinear_elastostatic.pl \
--	$(top_srcdir)/tests/nonlinear_membrane.pl \
--	$(top_srcdir)/tests/dynamic_friction.pl \
--	$(top_srcdir)/tests/plasticity.pl \
--	$(top_srcdir)/tests/plasticity_old_brick.pl \
--	$(top_srcdir)/tests/helmholtz.pl \
--	$(top_srcdir)/tests/schwarz_additive.pl \
--	$(top_srcdir)/tests/bilaplacian.pl \
--	$(top_srcdir)/tests/heat_equation.pl \
--	$(top_srcdir)/tests/wave_equation.pl \
--	$(top_srcdir)/tests/test_large_sliding_contact.pl \
--	$(top_srcdir)/tests/cyl_slicer.pl \
--	$(top_srcdir)/tests/make_gmm_test.pl
-+TESTS = $(srcdir)/tests/dynamic_array.pl \
-+	$(srcdir)/tests/dynamic_tas.pl \
-+	$(srcdir)/tests/test_int_set.pl \
-+	$(srcdir)/tests/test_tree_sorted.pl \
-+	$(srcdir)/tests/poly.pl \
-+	$(srcdir)/tests/test_small_vector.pl \
-+	$(srcdir)/tests/test_kdtree.pl \
-+	$(srcdir)/tests/test_rtree.pl \
-+	$(srcdir)/tests/geo_trans_inv.pl \
-+	$(srcdir)/tests/test_norm.pl \
-+	$(srcdir)/tests/test_mesh.pl \
-+	$(srcdir)/tests/test_interpolation.pl \
-+	$(srcdir)/tests/test_mat_elem.pl \
-+	$(srcdir)/tests/test_slice.pl \
-+	$(srcdir)/tests/integration.pl \
-+	$(srcdir)/tests/test_assembly.pl \
-+	$(srcdir)/tests/test_interpolated_fem.pl \
-+	$(srcdir)/tests/test_range_basis.pl \
-+	$(srcdir)/tests/laplacian.pl \
-+	$(srcdir)/tests/laplacian_with_bricks.pl \
-+	$(srcdir)/tests/elastostatic.pl \
-+	$(srcdir)/tests/stokes.pl $(srcdir)/tests/plate.pl \
-+	$(am__EXEEXT_2) $(srcdir)/tests/nonlinear_elastostatic.pl \
-+	$(srcdir)/tests/nonlinear_membrane.pl \
-+	$(srcdir)/tests/dynamic_friction.pl \
-+	$(srcdir)/tests/plasticity.pl \
-+	$(srcdir)/tests/plasticity_old_brick.pl \
-+	$(srcdir)/tests/helmholtz.pl \
-+	$(srcdir)/tests/schwarz_additive.pl \
-+	$(srcdir)/tests/bilaplacian.pl \
-+	$(srcdir)/tests/heat_equation.pl \
-+	$(srcdir)/tests/wave_equation.pl \
-+	$(srcdir)/tests/test_large_sliding_contact.pl \
-+	$(srcdir)/tests/cyl_slicer.pl \
-+	$(srcdir)/tests/make_gmm_test.pl
- subdir = tests
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/ac_python_devel.m4 \
--	$(top_srcdir)/m4/ax_check_cxx_flag.m4 \
--	$(top_srcdir)/m4/ax_prefix_config_h.m4 \
--	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
--	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
--	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/scilab.m4 \
--	$(top_srcdir)/configure.in
-+ACLOCAL_M4 = $(srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(srcdir)/m4/ac_python_devel.m4 \
-+	$(srcdir)/m4/ax_check_cxx_flag.m4 \
-+	$(srcdir)/m4/ax_prefix_config_h.m4 \
-+	$(srcdir)/m4/libtool.m4 $(srcdir)/m4/ltoptions.m4 \
-+	$(srcdir)/m4/ltsugar.m4 $(srcdir)/m4/ltversion.m4 \
-+	$(srcdir)/m4/lt~obsolete.m4 $(srcdir)/m4/scilab.m4 \
-+	$(srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(SHELL) $(srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -283,7 +283,7 @@
- wave_equation_LDADD = $(LDADD)
- wave_equation_DEPENDENCIES = ../src/libgetfem.la $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
-+depcomp = $(SHELL) $(srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -341,8 +341,8 @@
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- @QHULL_TRUE at am__EXEEXT_2 =  \
-- at QHULL_TRUE@	$(top_srcdir)/tests/test_mesh_im_level_set.pl \
-- at QHULL_TRUE@	$(top_srcdir)/tests/crack.pl
-+ at QHULL_TRUE@	$(srcdir)/tests/test_mesh_im_level_set.pl \
-+ at QHULL_TRUE@	$(srcdir)/tests/crack.pl
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -468,7 +468,7 @@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
-+abs_srcdir = @abs_srcdir@
- ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
-@@ -523,12 +523,12 @@
- target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
-+srcdir = @srcdir@
- @QHULL_FALSE at optprogs = 
- @QHULL_TRUE at optprogs = test_mesh_generation test_mesh_im_level_set crack
- @QHULL_FALSE at optpl = 
-- at QHULL_TRUE@optpl = $(top_srcdir)/tests/test_mesh_im_level_set.pl \
-- at QHULL_TRUE@        $(top_srcdir)/tests/crack.pl
-+ at QHULL_TRUE@optpl = $(srcdir)/tests/test_mesh_im_level_set.pl \
-+ at QHULL_TRUE@        $(srcdir)/tests/crack.pl
- 
- CLEANFILES = \
- 	laplacian.res laplacian.mesh laplacian.dataelt 			    \
-@@ -583,7 +583,7 @@
- cyl_slicer_SOURCES = cyl_slicer.cc
- test_continuation_SOURCES = test_continuation.cc
- test_large_sliding_contact_SOURCES = test_large_sliding_contact.cc
--INCLUDES = -I$(top_srcdir)/src -I../src
-+INCLUDES = -I$(srcdir)/src -I../src
- LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- EXTRA_DIST = \
- 	dynamic_array.pl                   			\
-@@ -685,8 +685,8 @@
- 	      exit 1;; \
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
--	$(am__cd) $(top_srcdir) && \
-+	echo ' cd $(srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
-+	$(am__cd) $(srcdir) && \
- 	  $(AUTOMAKE) --gnu tests/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-@@ -698,10 +698,10 @@
- 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- 	esac;
- 
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(srcdir)/configure:  $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-@@ -952,7 +952,7 @@
- 
- GTAGS:
- 	here=`$(am__cd) $(top_builddir) && pwd` \
--	  && $(am__cd) $(top_srcdir) \
-+	  && $(am__cd) $(srcdir) \
- 	  && gtags -i $(GTAGS_ARGS) "$$here"
- 
- distclean-tags:
-@@ -1053,7 +1053,7 @@
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- 	list='$(DISTFILES)'; \
- 	  dist_files=`for file in $$list; do echo $$file; done | \
- 	  sed -e "s|^$$srcdirstrip/||;t" \
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -1,7 +1,7 @@
- if QHULL
- optprogs = test_mesh_generation test_mesh_im_level_set crack
--optpl = $(top_srcdir)/tests/test_mesh_im_level_set.pl \
--        $(top_srcdir)/tests/crack.pl
-+optpl = tests/test_mesh_im_level_set.pl \
-+        tests/crack.pl
- else
- optprogs =
- optpl = 
-@@ -96,42 +96,42 @@
- 
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../src
-+INCLUDES = -Isrc -I../src
- LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- 
- TESTS = \
--	$(top_srcdir)/tests/dynamic_array.pl              \
--	$(top_srcdir)/tests/dynamic_tas.pl                \
--	$(top_srcdir)/tests/test_int_set.pl               \
--	$(top_srcdir)/tests/test_tree_sorted.pl           \
--	$(top_srcdir)/tests/poly.pl                       \
--	$(top_srcdir)/tests/test_small_vector.pl          \
--	$(top_srcdir)/tests/test_kdtree.pl                \
--	$(top_srcdir)/tests/test_rtree.pl                 \
--	$(top_srcdir)/tests/geo_trans_inv.pl              \
--	$(top_srcdir)/tests/test_norm.pl                  \
--	$(top_srcdir)/tests/test_mesh.pl                  \
--	$(top_srcdir)/tests/test_interpolation.pl         \
--	$(top_srcdir)/tests/test_mat_elem.pl              \
--	$(top_srcdir)/tests/test_slice.pl                 \
--	$(top_srcdir)/tests/integration.pl                \
--	$(top_srcdir)/tests/test_assembly.pl              \
--	$(top_srcdir)/tests/test_interpolated_fem.pl      \
--	$(top_srcdir)/tests/test_range_basis.pl           \
--	$(top_srcdir)/tests/laplacian.pl                  \
--	$(top_srcdir)/tests/stokes.pl                     \
--	$(top_srcdir)/tests/plate.pl                      \
-+	dynamic_array.pl              \
-+	dynamic_tas.pl                \
-+	test_int_set.pl               \
-+	test_tree_sorted.pl           \
-+	poly.pl                       \
-+	test_small_vector.pl          \
-+	test_kdtree.pl                \
-+	test_rtree.pl                 \
-+	geo_trans_inv.pl              \
-+	test_norm.pl                  \
-+	test_mesh.pl                  \
-+	test_interpolation.pl         \
-+	test_mat_elem.pl              \
-+	test_slice.pl                 \
-+	integration.pl                \
-+	test_assembly.pl              \
-+	test_interpolated_fem.pl      \
-+	test_range_basis.pl           \
-+	laplacian.pl                  \
-+	stokes.pl                     \
-+	plate.pl                      \
- 	$(optpl)                                          \
--	$(top_srcdir)/tests/nonlinear_elastostatic.pl     \
--	$(top_srcdir)/tests/nonlinear_membrane.pl         \
--	$(top_srcdir)/tests/dynamic_friction.pl           \
--	$(top_srcdir)/tests/plasticity.pl                 \
--	$(top_srcdir)/tests/plasticity_old_brick.pl       \
--	$(top_srcdir)/tests/helmholtz.pl                  \
--	$(top_srcdir)/tests/schwarz_additive.pl           \
--	$(top_srcdir)/tests/wave_equation.pl   	          \
--	$(top_srcdir)/tests/cyl_slicer.pl	          \
--	$(top_srcdir)/tests/make_gmm_test.pl
-+	nonlinear_elastostatic.pl     \
-+	nonlinear_membrane.pl         \
-+	dynamic_friction.pl           \
-+	plasticity.pl                 \
-+	plasticity_old_brick.pl       \
-+	helmholtz.pl                  \
-+	schwarz_additive.pl           \
-+	wave_equation.pl   	          \
-+	cyl_slicer.pl	          \
-+	make_gmm_test.pl
- 
- EXTRA_DIST =                               			\
- 	dynamic_array.pl                   			\
-@@ -212,4 +212,4 @@
- 	meshes/donut_regulier_512_elements.mesh
- 
- 
--TESTS_ENVIRONMENT = perl
-+TESTS_ENVIRONMENT = perl TESTS_DIR="$(top_builddir)/tests"
---- a/tests-2.0/Makefile.in
-+++ b/tests-2.0/Makefile.in
-@@ -45,46 +45,46 @@
- 	plate$(EXEEXT) nonlinear_elastostatic$(EXEEXT) \
- 	schwarz_additive$(EXEEXT) $(am__EXEEXT_1) plasticity$(EXEEXT) \
- 	dynamic_friction$(EXEEXT) bilaplacian$(EXEEXT)
--TESTS = $(top_srcdir)/tests-2.0/dynamic_array.pl \
--	$(top_srcdir)/tests-2.0/dynamic_tas.pl \
--	$(top_srcdir)/tests-2.0/test_int_set.pl \
--	$(top_srcdir)/tests-2.0/test_tree_sorted.pl \
--	$(top_srcdir)/tests-2.0/poly.pl \
--	$(top_srcdir)/tests-2.0/test_small_vector.pl \
--	$(top_srcdir)/tests-2.0/test_kdtree.pl \
--	$(top_srcdir)/tests-2.0/test_rtree.pl \
--	$(top_srcdir)/tests-2.0/geo_trans_inv.pl \
--	$(top_srcdir)/tests-2.0/test_norm.pl \
--	$(top_srcdir)/tests-2.0/test_mesh.pl \
--	$(top_srcdir)/tests-2.0/test_interpolation.pl \
--	$(top_srcdir)/tests-2.0/test_mat_elem.pl \
--	$(top_srcdir)/tests-2.0/test_slice.pl \
--	$(top_srcdir)/tests-2.0/integration.pl \
--	$(top_srcdir)/tests-2.0/test_assembly.pl \
--	$(top_srcdir)/tests-2.0/test_interpolated_fem.pl \
--	$(top_srcdir)/tests-2.0/laplacian.pl \
--	$(top_srcdir)/tests-2.0/elastostatic.pl \
--	$(top_srcdir)/tests-2.0/stokes.pl \
--	$(top_srcdir)/tests-2.0/plate.pl $(am__EXEEXT_2) \
--	$(top_srcdir)/tests-2.0/nonlinear_elastostatic.pl \
--	$(top_srcdir)/tests-2.0/dynamic_friction.pl \
--	$(top_srcdir)/tests-2.0/plasticity.pl \
--	$(top_srcdir)/tests-2.0/helmholtz.pl \
--	$(top_srcdir)/tests-2.0/schwarz_additive.pl \
--	$(top_srcdir)/tests-2.0/bilaplacian.pl
-+TESTS = tests-2.0/dynamic_array.pl \
-+	tests-2.0/dynamic_tas.pl \
-+	tests-2.0/test_int_set.pl \
-+	tests-2.0/test_tree_sorted.pl \
-+	tests-2.0/poly.pl \
-+	tests-2.0/test_small_vector.pl \
-+	tests-2.0/test_kdtree.pl \
-+	tests-2.0/test_rtree.pl \
-+	tests-2.0/geo_trans_inv.pl \
-+	tests-2.0/test_norm.pl \
-+	tests-2.0/test_mesh.pl \
-+	tests-2.0/test_interpolation.pl \
-+	tests-2.0/test_mat_elem.pl \
-+	tests-2.0/test_slice.pl \
-+	tests-2.0/integration.pl \
-+	tests-2.0/test_assembly.pl \
-+	tests-2.0/test_interpolated_fem.pl \
-+	tests-2.0/laplacian.pl \
-+	tests-2.0/elastostatic.pl \
-+	tests-2.0/stokes.pl \
-+	tests-2.0/plate.pl $(am__EXEEXT_2) \
-+	tests-2.0/nonlinear_elastostatic.pl \
-+	tests-2.0/dynamic_friction.pl \
-+	tests-2.0/plasticity.pl \
-+	tests-2.0/helmholtz.pl \
-+	tests-2.0/schwarz_additive.pl \
-+	tests-2.0/bilaplacian.pl
- subdir = tests-2.0
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/ac_python_devel.m4 \
--	$(top_srcdir)/m4/ax_check_cxx_flag.m4 \
--	$(top_srcdir)/m4/ax_prefix_config_h.m4 \
--	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
--	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
--	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/scilab.m4 \
--	$(top_srcdir)/configure.in
-+ACLOCAL_M4 = aclocal.m4
-+am__aclocal_m4_deps = m4/ac_python_devel.m4 \
-+	m4/ax_check_cxx_flag.m4 \
-+	m4/ax_prefix_config_h.m4 \
-+	m4/libtool.m4 m4/ltoptions.m4 \
-+	m4/ltsugar.m4 m4/ltversion.m4 \
-+	m4/lt~obsolete.m4 m4/scilab.m4 \
-+	configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+mkinstalldirs = $(SHELL) mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -213,7 +213,7 @@
- test_tree_sorted_DEPENDENCIES = ../src/libgetfem.la \
- 	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
-+depcomp = $(SHELL) depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -259,7 +259,7 @@
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- @QHULL_TRUE at am__EXEEXT_2 =  \
-- at QHULL_TRUE@	$(top_srcdir)/tests-2.0/test_mesh_im_level_set.pl
-+ at QHULL_TRUE@	tests-2.0/test_mesh_im_level_set.pl
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -444,7 +444,7 @@
- @QHULL_FALSE at optprogs = 
- @QHULL_TRUE at optprogs = test_mesh_im_level_set
- @QHULL_FALSE at optpl = 
-- at QHULL_TRUE@optpl = $(top_srcdir)/tests-2.0/test_mesh_im_level_set.pl
-+ at QHULL_TRUE@optpl = tests-2.0/test_mesh_im_level_set.pl
- CLEANFILES = \
- 	laplacian.res laplacian.mesh laplacian.dataelt \
- 	elasto_static.mesh test_mesh.mesh toto.mat test_mat_elem.mesh \
-@@ -483,7 +483,7 @@
- @QHULL_TRUE at test_mesh_im_level_set_SOURCES = test_mesh_im_level_set.cc 
- dynamic_friction_SOURCES = dynamic_friction.cc
- bilaplacian_SOURCES = bilaplacian.cc
--INCLUDES = -I$(top_srcdir)/src -I../src
-+INCLUDES = -Isrc -I../src
- LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- EXTRA_DIST = \
- 	dynamic_array.pl                  \
-@@ -552,10 +552,10 @@
- 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- 	esac;
- 
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+configure:  $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
---- a/tests-2.0/Makefile.am
-+++ b/tests-2.0/Makefile.am
-@@ -1,6 +1,6 @@
- if QHULL
- optprogs = test_mesh_im_level_set
--optpl = $(top_srcdir)/tests-2.0/test_mesh_im_level_set.pl
-+optpl = tests-2.0/test_mesh_im_level_set.pl
- else
- optprogs =
- optpl = 
-@@ -78,41 +78,41 @@
- bilaplacian_SOURCES = bilaplacian.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../src
-+INCLUDES = -Isrc -I../src
- LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- 
- #plasticity_LDADD = ../src/libgetfem.la -lm @SUPLDFLAGS@ $(HOME)/source++/SuperLU/superlu.a -lblas -lg2c
- #plasticity_INCLUDES = $(INCLUDES) -I$(HOME)/source++/SuperLU/
- 
- TESTS = \
--	$(top_srcdir)/tests-2.0/dynamic_array.pl           \
--	$(top_srcdir)/tests-2.0/dynamic_tas.pl             \
--	$(top_srcdir)/tests-2.0/test_int_set.pl            \
--	$(top_srcdir)/tests-2.0/test_tree_sorted.pl        \
--	$(top_srcdir)/tests-2.0/poly.pl                    \
--	$(top_srcdir)/tests-2.0/test_small_vector.pl       \
--	$(top_srcdir)/tests-2.0/test_kdtree.pl             \
--	$(top_srcdir)/tests-2.0/test_rtree.pl              \
--	$(top_srcdir)/tests-2.0/geo_trans_inv.pl           \
--	$(top_srcdir)/tests-2.0/test_norm.pl               \
--	$(top_srcdir)/tests-2.0/test_mesh.pl               \
--	$(top_srcdir)/tests-2.0/test_interpolation.pl      \
--	$(top_srcdir)/tests-2.0/test_mat_elem.pl           \
--	$(top_srcdir)/tests-2.0/test_slice.pl              \
--	$(top_srcdir)/tests-2.0/integration.pl             \
--	$(top_srcdir)/tests-2.0/test_assembly.pl           \
--	$(top_srcdir)/tests-2.0/test_interpolated_fem.pl   \
--	$(top_srcdir)/tests-2.0/laplacian.pl               \
--	$(top_srcdir)/tests-2.0/elastostatic.pl            \
--	$(top_srcdir)/tests-2.0/stokes.pl                  \
--	$(top_srcdir)/tests-2.0/plate.pl                   \
-+	tests-2.0/dynamic_array.pl           \
-+	tests-2.0/dynamic_tas.pl             \
-+	tests-2.0/test_int_set.pl            \
-+	tests-2.0/test_tree_sorted.pl        \
-+	tests-2.0/poly.pl                    \
-+	tests-2.0/test_small_vector.pl       \
-+	tests-2.0/test_kdtree.pl             \
-+	tests-2.0/test_rtree.pl              \
-+	tests-2.0/geo_trans_inv.pl           \
-+	tests-2.0/test_norm.pl               \
-+	tests-2.0/test_mesh.pl               \
-+	tests-2.0/test_interpolation.pl      \
-+	tests-2.0/test_mat_elem.pl           \
-+	tests-2.0/test_slice.pl              \
-+	tests-2.0/integration.pl             \
-+	tests-2.0/test_assembly.pl           \
-+	tests-2.0/test_interpolated_fem.pl   \
-+	tests-2.0/laplacian.pl               \
-+	tests-2.0/elastostatic.pl            \
-+	tests-2.0/stokes.pl                  \
-+	tests-2.0/plate.pl                   \
- 	$(optpl)                                       \
--	$(top_srcdir)/tests-2.0/nonlinear_elastostatic.pl  \
--	$(top_srcdir)/tests-2.0/dynamic_friction.pl        \
--	$(top_srcdir)/tests-2.0/plasticity.pl              \
--	$(top_srcdir)/tests-2.0/helmholtz.pl               \
--	$(top_srcdir)/tests-2.0/schwarz_additive.pl        \
--	$(top_srcdir)/tests-2.0/bilaplacian.pl
-+	tests-2.0/nonlinear_elastostatic.pl  \
-+	tests-2.0/dynamic_friction.pl        \
-+	tests-2.0/plasticity.pl              \
-+	tests-2.0/helmholtz.pl               \
-+	tests-2.0/schwarz_additive.pl        \
-+	tests-2.0/bilaplacian.pl
- 
- EXTRA_DIST = \
- 	dynamic_array.pl                  \
---- a/contrib/mixed_elastostatic/Makefile.am
-+++ b/contrib/mixed_elastostatic/Makefile.am
-@@ -8,10 +8,10 @@
- mixed_elastostatic_SOURCES = mixed_elastostatic.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm  $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/mixed_elastostatic/mixed_elastostatic.pl
-+TESTS = contrib/mixed_elastostatic/mixed_elastostatic.pl
- 
- EXTRA_DIST = \
- 	mixed_elastostatic.pl                  \
---- a/contrib/crack_plate/Makefile.am
-+++ b/contrib/crack_plate/Makefile.am
-@@ -15,11 +15,11 @@
- endif
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
- if QHULL
--TESTS = $(top_srcdir)/contrib/crack_plate/crack_mindlin.pl
-+TESTS = contrib/crack_plate/crack_mindlin.pl
- else
- TESTS =
- endif
---- a/contrib/bimaterial_crack_test/Makefile.am
-+++ b/contrib/bimaterial_crack_test/Makefile.am
-@@ -9,11 +9,11 @@
- bimaterial_crack_test_SOURCES = bimaterial_crack_test.cc
- crack_SOURCES = crack.cc crack_exact_solution.cc crack_exact_solution.h
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src 
-+INCLUDES = -Isrc -I../../src 
- LDADD    = ../../src/libgetfem.la -lm  $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/bimaterial_crack_test/bimaterial_crack_test.pl \
--        $(top_srcdir)/contrib/bimaterial_crack_test/crack.pl
-+TESTS = contrib/bimaterial_crack_test/bimaterial_crack_test.pl \
-+        contrib/bimaterial_crack_test/crack.pl
- EXTRA_DIST = \
- 	bimaterial_crack_test.pl                  \
- 	bimaterial_crack_test.param          \
---- a/contrib/icare/Makefile.am
-+++ b/contrib/icare/Makefile.am
-@@ -10,10 +10,10 @@
- SUPLDFLAGS = @SUPLDFLAGS@
- MUMPS_LIBS = @MUMPS_LIBS@
- # MUMPS_CFLAGS = @MUMPS_CFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src # $(MUMPS_CFLAGS)
-+INCLUDES = -Isrc -I../../src # $(MUMPS_CFLAGS)
- LDADD    = ../../src/libgetfem.la -lm $(MUMPS_LIBS) $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/icare/icare.pl
-+TESTS = contrib/icare/icare.pl
- 
- EXTRA_DIST = \
- 	icare.pl                  \
---- a/contrib/static_friction/Makefile.am
-+++ b/contrib/static_friction/Makefile.am
-@@ -7,10 +7,10 @@
- 
- static_friction_SOURCES = static_friction.cc
- 
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm @SUPLDFLAGS@
- 
--TESTS = $(top_srcdir)/contrib/static_friction/static_friction.pl
-+TESTS = contrib/static_friction/static_friction.pl
- 
- EXTRA_DIST = \
- 	static_friction.pl                  \
---- a/contrib/xfem_stab_unilat_contact/Makefile.am
-+++ b/contrib/xfem_stab_unilat_contact/Makefile.am
-@@ -8,10 +8,10 @@
- 
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.pl
-+TESTS = contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.pl
- 
- EXTRA_DIST = 				\
- 	xfem_stab_unilat_contact.param	\
---- a/contrib/aposteriori/Makefile.am
-+++ b/contrib/aposteriori/Makefile.am
-@@ -7,11 +7,11 @@
- aposteriori_SOURCES = aposteriori.cc
- aposteriori_laplacian_SOURCES = aposteriori_laplacian.cc
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/aposteriori/aposteriori.pl \
--        $(top_srcdir)/contrib/aposteriori/aposteriori_laplacian.pl 
-+TESTS = contrib/aposteriori/aposteriori.pl \
-+        contrib/aposteriori/aposteriori_laplacian.pl 
- 
- EXTRA_DIST = \
- 	aposteriori_laplacian.pl      	 \
---- a/contrib/bimat_contact_crack_test/Makefile.am
-+++ b/contrib/bimat_contact_crack_test/Makefile.am
-@@ -7,11 +7,11 @@
- 
- bimaterial_crack_test_SOURCES = bimaterial_crack_test.cc
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/bimaterial_crack_test/bimaterial_crack_test.pl \
--        $(top_srcdir)/contrib/bimaterial_crack_test/crack.pl
-+TESTS = contrib/bimaterial_crack_test/bimaterial_crack_test.pl \
-+        contrib/bimaterial_crack_test/crack.pl
- EXTRA_DIST = \
- 	bimaterial_crack_test.pl                  \
- 	bimaterial_crack_test.param
---- a/contrib/xfem_large_strain/Makefile.am
-+++ b/contrib/xfem_large_strain/Makefile.am
-@@ -10,10 +10,10 @@
-                               getfem_nonlinear_elastoptim.h \
-                               compressible_getfem_nonlinear_elastoptim.h
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src $(MUMPS_CFLAGS)
-+INCLUDES = -Isrc -I../../src $(MUMPS_CFLAGS)
- LDADD    = ../../src/libgetfem.la -lm $(MUMPS_LIBS) $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/xfem_large_strain/xfem_large_strain.pl
-+TESTS = contrib/xfem_large_strain/xfem_large_strain.pl
- EXTRA_DIST = \
- 	xfem_large_strain.pl            \
- 	vertex_large_strain.param       \
---- a/contrib/mixed_dynamic_friction/Makefile.am
-+++ b/contrib/mixed_dynamic_friction/Makefile.am
-@@ -8,10 +8,10 @@
- mixed_scalar_hyperbolic_SOURCES = mixed_scalar_hyperbolic.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/mixed_dynamic_friction/mixed_dynamic_friction.pl
-+TESTS = contrib/mixed_dynamic_friction/mixed_dynamic_friction.pl
- EXTRA_DIST = \
- 	mixed_dynamic_friction.pl                  \
- 	mixed_dynamic_friction.param               \
---- a/contrib/static_contact_gears/Makefile.am
-+++ b/contrib/static_contact_gears/Makefile.am
-@@ -8,7 +8,7 @@
- static_contact_gears_u1_u2_SOURCES = static_contact_gears_u1_u2.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
- TESTS = 
---- a/contrib/contact_grd_trans/Makefile.am
-+++ b/contrib/contact_grd_trans/Makefile.am
-@@ -8,10 +8,10 @@
- contact_continuation_load_SOURCES = contact_continuation_load.cc
- contact_continuation_time_SOURCES = contact_continuation_time.cc
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/contact_grd_trans/contact.pl
-+TESTS = contrib/contact_grd_trans/contact.pl
- EXTRA_DIST = \
- 	contact.pl                  \
- 	contact.param 
---- a/contrib/xfem_contact/Makefile.am
-+++ b/contrib/xfem_contact/Makefile.am
-@@ -15,10 +15,10 @@
- xfem_stokes_SOURCES = xfem_stokes.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/xfem_contact/xfem_contact.pl
-+TESTS = contrib/xfem_contact/xfem_contact.pl
- 
- EXTRA_DIST = \
- 	xfem_contact.pl                  \
---- a/contrib/inter_element_test/Makefile.am
-+++ b/contrib/inter_element_test/Makefile.am
-@@ -7,10 +7,10 @@
- inter_element_SOURCES = inter_element.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src 
-+INCLUDES = -Isrc -I../../src 
- LDADD    = ../../src/libgetfem.la -lm  $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/inter_element_test/inter_element.pl
-+TESTS = contrib/inter_element_test/inter_element.pl
- 
- EXTRA_DIST = inter_element.pl
- 
---- a/contrib/delaminated_crack/Makefile.am
-+++ b/contrib/delaminated_crack/Makefile.am
-@@ -8,10 +8,10 @@
- delaminated_crack_SOURCES = delaminated_crack.cc
- 
- SUPLDFLAGS = @SUPLDFLAGS@
--INCLUDES = -I$(top_srcdir)/src -I../../src 
-+INCLUDES = -Isrc -I../../src 
- LDADD    = ../../src/libgetfem.la -lm $(SUPLDFLAGS)
- 
--TESTS = $(top_srcdir)/contrib/delaminated_crack/delaminated_crack.pl
-+TESTS = contrib/delaminated_crack/delaminated_crack.pl
- 
- EXTRA_DIST = \
- 	delaminated_crack.pl                  \
---- a/interface/src/python/Makefile.am
-+++ b/interface/src/python/Makefile.am
-@@ -22,7 +22,7 @@
- PYTHON_CC=$(CC)
- 
- getfem_python_c.c : getfem_python.c
--	cp $(srcdir)/getfem_python.c getfem_python_c.c
-+	cp getfem_python.c getfem_python_c.c
- 
- # ARCHFLAGS is set to empty to disable universal binaries with python 2.5 on macos 10.5
- _getfem.so: getfem_python_c.c ../libgetfemint.la $(GETFEM_LIB_LA)
---- a/cubature/Makefile.am
-+++ b/cubature/Makefile.am
-@@ -5,7 +5,7 @@
- EXTRA_DIST = $(IM_METHODS_LOC) make_getfem_im_list getfem_im_list.h
- 
- getfem_im_list.h :  $(IM_METHODS)
--	$(top_srcdir)/cubature/make_getfem_im_list $(top_srcdir)/cubature
-+	cubature/make_getfem_im_list $(top_srcdir)/cubature
- 	cp ./getfem_im_list.h ../src/getfem/getfem_im_list.h
- 
- 
---- a/interface/tests/python/Makefile.am
-+++ b/interface/tests/python/Makefile.am
-@@ -19,13 +19,13 @@
- 
- if BUILDPYTHON
- TESTS = 						\
--	$(srcdir)/check_export.py			\
--	$(srcdir)/demo_wave.py				\
--	$(srcdir)/demo_laplacian.py			\
--	$(srcdir)/check_levelset.py
-+	check_export.py			\
-+	demo_wave.py				\
-+	demo_laplacian.py			\
-+	check_levelset.py
- 
- TESTS_ENVIRONMENT = \
--	PYTHONPATH=$(srcdir):$(srcdir)/../../src/python:.:../../src/python \
-+	PYTHONPATH=$(srcdir):../../src/python:.:../../src/python \
- 	python
- endif
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -211,7 +211,7 @@
- libgetfem_la_SOURCES = $(SRC)
- libgetfem_la_LDFLAGS = ${LIBTOOL_VERSION_INFO}
- libgetfem_la_LIBADD = @SUPERLU_LIBS@ @MUMPS_LIBS@
--INCLUDES = -I$(top_srcdir)/src -I../src -I$(top_srcdir)
-+INCLUDES = -Isrc -I../src
- 
- CLEANFILES = ii_files/* *.o.d
- DISTCLEANFILES = getfem/getfem_im_list.h getfem/getfem_arch_config.h
---- a/interface/src/Makefile.am
-+++ b/interface/src/Makefile.am
-@@ -128,7 +128,7 @@
- 	getfemint_poly.h
- 
- #libgetfemint_la_INCLUDES = @GETFEM_CPPFLAGS@ #fails with automake 1.6 on macos x tiger
--INCLUDES = -I$(top_srcdir)/src -I../../src
-+INCLUDES = -Isrc -I../../src
- 
- # -rdynamic for backtraces
- #AM_LDFLAGS = -rdynamic
-@@ -140,7 +140,7 @@
- getfem_server_LINK=$(CXXLINK)
- getfem_server_LDADD = libgetfemint.la ../../src/libgetfem.la @RPC_LIB@ -lm #-lstdc++ <- a corrgier pour icc
- getfem_server_LDFLAGS = @GFSERVERFLAGS@ @SUPLDFLAGS@
--getfem_server_INCLUDES = -I$(RPC_INC_DIR) -I$(top_srcdir)/src -I../../src
-+getfem_server_INCLUDES = -I$(RPC_INC_DIR) -Isrc -I../../src
- getfem_server_LIBS = libgetfemint.la
- 
- EXTRA_PROGRAMS = getfem_server
---- a/interface/tests/matlab/Makefile.am
-+++ b/interface/tests/matlab/Makefile.am
-@@ -1,7 +1,7 @@
- SUBDIRS = private
- 
- if BUILDMEX
--TESTS = $(srcdir)/check_all.sh
-+TESTS = check_all.sh
- else
- TESTS = 
- endif
diff --git a/debian/patches/fix_mumps_error.patch b/debian/patches/fix_mumps_error.patch
deleted file mode 100644
index 4f61c2a..0000000
--- a/debian/patches/fix_mumps_error.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Fix definition order of mumps_error_check.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-11-04
-
---- a/src/gmm/gmm_MUMPS_interface.h
-+++ b/src/gmm/gmm_MUMPS_interface.h
-@@ -130,6 +130,32 @@
-   };
- 
- 
-+  template <typename MUMPS_STRUCT>
-+  static inline bool mumps_error_check(MUMPS_STRUCT &id) {
-+#define INFO(I) info[(I)-1]
-+    if (id.INFO(1) < 0) {
-+      switch (id.INFO(1)) {
-+        case -2:
-+          GMM_ASSERT1(false, "Solve with MUMPS failed: NZ = " << id.INFO(2)
-+                      << " is out of range");
-+        case -6 : case -10 :
-+          GMM_WARNING1("Solve with MUMPS failed: matrix is singular");
-+          return false;
-+        case -9:
-+          GMM_ASSERT1(false, "Solve with MUMPS failed: error "
-+                      << id.INFO(1) << ", increase ICNTL(14)");
-+        case -13 :
-+          GMM_ASSERT1(false, "Solve with MUMPS failed: not enough memory");
-+        default :
-+          GMM_ASSERT1(false, "Solve with MUMPS failed with error "
-+                      << id.INFO(1));
-+      }
-+    }
-+    return true;
-+#undef INFO
-+  }
-+
-+
-   /** MUMPS solve interface  
-    *  Works only with sparse or skyline matrices
-    */
-@@ -280,32 +306,6 @@
-   }
- 
- 
--  template <typename MUMPS_STRUCT>
--  static inline bool mumps_error_check(MUMPS_STRUCT &id) {
--#define INFO(I) info[(I)-1]
--    if (id.INFO(1) < 0) {
--      switch (id.INFO(1)) {
--        case -2:
--          GMM_ASSERT1(false, "Solve with MUMPS failed: NZ = " << id.INFO(2)
--                      << " is out of range");
--        case -6 : case -10 :
--          GMM_WARNING1("Solve with MUMPS failed: matrix is singular");
--          return false;
--        case -9:
--          GMM_ASSERT1(false, "Solve with MUMPS failed: error "
--                      << id.INFO(1) << ", increase ICNTL(14)");
--        case -13 :
--          GMM_ASSERT1(false, "Solve with MUMPS failed: not enough memory");
--        default :
--          GMM_ASSERT1(false, "Solve with MUMPS failed with error "
--                      << id.INFO(1));
--      }
--    }
--    return true;
--#undef INFO
--  }
--
--
- }
- 
-   
diff --git a/debian/patches/ld-no-add-needed.patch b/debian/patches/ld-no-add-needed.patch
deleted file mode 100644
index c1296a2..0000000
--- a/debian/patches/ld-no-add-needed.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Desctiption: fix build with ld --no-add-needed
-Bug-Debian: http://bugs.debian.org/640410
-Author: Matthias Klose <doko at ubuntu.com>
-Last-Update: 2012-01-18
-
-@@ -0,0 +1,44 @@
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -584,7 +584,7 @@
- test_continuation_SOURCES = test_continuation.cc
- test_large_sliding_contact_SOURCES = test_large_sliding_contact.cc
- INCLUDES = -I$(top_srcdir)/src -I../src
--LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS)
-+LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- EXTRA_DIST = \
- 	dynamic_array.pl                   			\
- 	dynamic_tas.pl                     			\
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -105,7 +105,7 @@
- 
- SUPLDFLAGS = @SUPLDFLAGS@
- INCLUDES = -I$(top_srcdir)/src -I../src
--LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS)
-+LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- 
- TESTS = \
- 	$(top_srcdir)/tests/dynamic_array.pl              \
---- a/tests-2.0/Makefile.in
-+++ b/tests-2.0/Makefile.in
-@@ -484,7 +484,7 @@
- dynamic_friction_SOURCES = dynamic_friction.cc
- bilaplacian_SOURCES = bilaplacian.cc
- INCLUDES = -I$(top_srcdir)/src -I../src
--LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS)
-+LDADD = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- EXTRA_DIST = \
- 	dynamic_array.pl                  \
- 	dynamic_tas.pl                    \
---- a/tests-2.0/Makefile.am
-+++ b/tests-2.0/Makefile.am
-@@ -79,7 +79,7 @@
- 
- SUPLDFLAGS = @SUPLDFLAGS@
- INCLUDES = -I$(top_srcdir)/src -I../src
--LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS)
-+LDADD    = ../src/libgetfem.la -lm $(SUPLDFLAGS) $(MUMPS_LIBS)
- 
- #plasticity_LDADD = ../src/libgetfem.la -lm @SUPLDFLAGS@ $(HOME)/source++/SuperLU/superlu.a -lblas -lg2c
- #plasticity_INCLUDES = $(INCLUDES) -I$(HOME)/source++/SuperLU/
diff --git a/debian/patches/respect_nometis_flag.patch b/debian/patches/respect_nometis_flag.patch
deleted file mode 100644
index 6c3be9e..0000000
--- a/debian/patches/respect_nometis_flag.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: respect GETFEM_HAVE_METIS variable
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-02-03
-
---- a/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
-+++ b/contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact.cc
-@@ -42,6 +42,7 @@
- #include "getfem/getfem_mesh_fem_sum.h"
- #include "gmm/gmm_inoutput.h"
- 
-+#ifdef GETFEM_HAVE_METIS 
- extern "C" void METIS_PartGraphKway(int *, int *, int *, int *, int *, int *,
- 			    int *, int *, int *, int *, int *);
- extern "C" void METIS_PartGraphRecursive(int *, int *, int *, int *, int *, int *,
-@@ -52,6 +53,7 @@
- 				      int *, int *, float *, int *, int *, int *);
- extern "C" void METIS_mCPartGraphRecursive(int *, int *, int *, int *, int *, int *, int *,
- 				      int *, int *, int *, int *, int *);
-+#endif
- 
- /* some Getfem++ types that we will be using */
- using bgeot::base_small_vector; /* special class for small (dim<16) vectors */
-@@ -506,9 +508,10 @@
-   //			 &numflag, &nparts,  options, &edgecut, &(part[0]));
-   //METIS_PartGraphKway(&ne, &(xadj[0]), &(adjncy[0]), &(vwgt[0]), &(adjwgt[0]), &wgtflag,
-   //	  &numflag, &nparts, options, &edgecut, &(part[0]));
-+  #ifdef GETFEM_HAVE_METIS 
-   METIS_PartGraphRecursive(&ne, &(xadj[0]), &(adjncy[0]), &(vwgt[0]), &(adjwgt[0]), &wgtflag,
- 			   &numflag, &nparts, options, &edgecut, &(part[0]));
--  
-+  #endif
-   //cout<<"size_of_mesh="<<h<<endl;
-   cout<<"size_of_crack="<< size_of_crack <<endl;
-   cout<<"nb_partition="<<nparts<<endl;
diff --git a/debian/patches/series b/debian/patches/series
index fc90a26..b64f88c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
-disableXaccess.diff
-addgetfempath.diff
-ld-no-add-needed.patch
-fix_mumps_error.patch
-stream_redirect.diff
-respect_nometis_flag.patch
-disable_some_tests.patch
-fix_FTBFS_topsrc.patch
+02_addgetfempath.diff
+03_disableXaccess.diff
diff --git a/debian/patches/stream_redirect.diff b/debian/patches/stream_redirect.diff
deleted file mode 100644
index e753060..0000000
--- a/debian/patches/stream_redirect.diff
+++ /dev/null
@@ -1,108 +0,0 @@
-Index: getfem/interface/src/scilab/sci_gateway/c/stream_redirect.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ getfem/interface/src/scilab/sci_gateway/c/stream_redirect.h	2012-11-17 16:54:43.115859494 +0100
-@@ -0,0 +1,103 @@
-+/* -*- c++ -*- (enables emacs c++ mode) */
-+/*========================================================================
-+
-+ Copyright (C) 2009-2011 Yann Collette
-+
-+ This file is a part of GETFEM++
-+
-+ Getfem++ is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU Lesser General Public License as
-+ published by the Free Software Foundation; either version 2.1 of the
-+ License, or (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ GNU Lesser General Public License for more details.
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301,
-+ USA.
-+
-+ As a special exception, you may use this file as part of a free software
-+ library without restriction.  Specifically, if other files instantiate
-+ templates or use macros or inline functions from this file, or you compile
-+ this file and link it with other files to produce an executable, this
-+ file does not by itself cause the resulting executable to be covered by
-+ the GNU General Public License.  This exception does not however
-+ invalidate any other reasons why the executable file might be covered by
-+ the GNU General Public License.
-+
-+ ========================================================================*/
-+
-+#ifndef STREAM_REDIRECT_H
-+#define STREAM_REDIRECT_H
-+
-+#include <sciprint.h>
-+
-+#include <iostream>
-+#include <streambuf>
-+#include <string>
-+
-+//////////////////////////
-+// For cout redirection //
-+//////////////////////////
-+
-+class ScilabStream : public std::basic_streambuf<char>
-+{
-+public:
-+  ScilabStream(std::ostream &stream) : m_stream(stream)
-+  {
-+    m_old_buf = stream.rdbuf();
-+    stream.rdbuf(this);
-+  }
-+  ~ScilabStream()
-+  {
-+    // output anything that is left
-+    if (!m_string.empty())
-+      sciprint("symphony: %s\n",m_string.c_str());
-+
-+    m_stream.rdbuf(m_old_buf);
-+  }
-+
-+protected:
-+  virtual int_type overflow(int_type v)
-+  {
-+    if (v == EOF)
-+      {
-+        sciprint("symphony: %s\n",m_string.c_str());
-+        m_string.clear();
-+      }
-+    else
-+      m_string.push_back(v);
-+   
-+    return v;
-+  }
-+ 
-+  virtual std::streamsize xsputn(const char *p, std::streamsize n)
-+  {
-+    m_string.append(p, p + n);
-+   
-+    int pos = 0;
-+    while (pos != std::string::npos)
-+      {
-+        pos = m_string.find(EOF);
-+        if (pos != std::string::npos)
-+          {
-+            std::string tmp(m_string.begin(), m_string.begin() + pos);
-+            sciprint("symphony: %s\n",tmp.c_str());
-+            m_string.erase(m_string.begin(), m_string.begin() + pos + 1);
-+          }
-+      }
-+   
-+    return n;
-+  }
-+ 
-+private:
-+  std::ostream   &m_stream;
-+  std::streambuf *m_old_buf;
-+  std::string     m_string;
-+};
-+#endif
-+
-+

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



More information about the debian-science-commits mailing list