[SCM] FreeFem++ packaging branch, master, updated. debian/3.14-1-4-g8b34bcb
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Tue Nov 15 13:57:06 UTC 2011
The following commit has been merged in the master branch:
commit 03a43b199d4e4d614118aeefab45b18ecb0d2fb6
Merge: 1f0d4316dd24fcc385c59293f494aa3ebe10ff7f 05a6385c2eb06c777f3deea75b770eac17a8b6ad
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Nov 15 15:28:58 2011 +0200
Merge commit 'upstream/3.16'
Conflicts:
DOC/freefem++doc.pdf
download/gmm/cxxflags
diff --combined examples++-load/Makefile.am
index f7fde73,a40c5f0..4983ec6
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@@ -25,7 -25,7 +25,7 @@@ EXTRA_DIST=ff-get-dep.in ff-pkg-downloa
all.edp makeref.edp testFE-P3dc.edp \
bilapMorley.edp myType.edp testFE.edp \
convect_dervieux.edp testFEMorley.edp \
- testFE-PkEdge.edp \
+ testFE-PkEdge.edp metis.edp schwarz-nm.edp \
splitmesh3.cpp splitmesh3.edp splitmesh6.cpp splitmesh6.edp \
README_SuperLU \
tetgen.cpp\
@@@ -38,11 -38,12 +38,12 @@@
DxWriter.cpp metis.cpp pcm.cpp pcm.hpp pcm2rnm.cpp \
UMFPACK64.cpp iovtk.cpp gmsh.cpp MetricKuate.cpp \
ffnewuoa.cpp ffnewuoa.edp newuoa.f Element_P1dc1.cpp ilut.cpp ilut.edp \
- freeyams.cpp mmg3d.cpp mshmet.cpp \
+ freeyams.cpp mmg3d-v4.0.cpp mshmet.cpp \
BinaryIO.cpp gsl.cpp gsl.awk ff_gsl_awk.hpp isolineP1.cpp lg.pgm Leman-mesh.edp \
thresholdings.cpp thresholdings.edp \
VTK_writer_3d.cpp VTK_writer.cpp splitedges.cpp splitedges.edp \
- Element_Mixte.cpp LaplaceRT1.edp lame-TD-NSS.edp test-ElementMixte.edp
+ Element_Mixte.cpp LaplaceRT1.edp lame-TD-NSS.edp test-ElementMixte.edp \
+ myfunction2.cpp myfunction2.edp ttestio.edp
LIST_COMPILE=myfunction.$(DYLIB_SUFFIX) BernadiRaugel.$(DYLIB_SUFFIX) \
@@@ -60,12 -61,13 +61,13 @@@
Element_P1dc1.$(DYLIB_SUFFIX) BinaryIO.$(DYLIB_SUFFIX) \
isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
- splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX)
+ splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
+ myfunction2.$(DYLIB_SUFFIX)
LIST_COMPILE_PKG= tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
metis.$(DYLIB_SUFFIX) UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) \
lapack.$(DYLIB_SUFFIX) fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
- freeyams.$(DYLIB_SUFFIX) mmg3d.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
+ freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
gsl.$(DYLIB_SUFFIX)
bin_PROGRAMS=
@@@ -94,8 -96,8 +96,8 @@@ makeref.edp: regtests.m4 ../regtests.m
all-local: all.edp regtests.edp load_compile
- all.edp:
- (echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
+ all.edp: Makefile
+ (echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
@@@ -130,6 -132,8 +132,8 @@@ ff-get-dep:ff-get-dep.in Makefil
WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config WHERE_LIBRARY
@./ff-pkg-download >$@-new
@diff $@-new $@ || (cp $@-new $@ ;touch WHERE_LIBRARY)
+ WHERE_LIBRARY:
+ touch $@
FORCE: ;
freefem++.pref:
echo loadpath = \"./\" >freefem++.pref
@@@ -140,7 -144,8 +144,7 @@@ install-exec-local:: load_compil
$(INSTALL_DATA) clapack.h ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(ff_prefix_dir)/include
$(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
diff --combined examples++-load/Makefile.in
index 452cd64,ac1e9d9..6167e92
--- a/examples++-load/Makefile.in
+++ b/examples++-load/Makefile.in
@@@ -226,6 -226,7 +226,7 @@@ docdir = @docdir
dvidir = @dvidir@
exec_prefix = @exec_prefix@
ff_bison = @ff_bison@
+ ff_cmake = @ff_cmake@
ff_convert = @ff_convert@
ff_curl = @ff_curl@
ff_dvips = @ff_dvips@
@@@ -291,7 -292,7 +292,7 @@@ EXTRA_DIST = ff-get-dep.in ff-pkg-downl
all.edp makeref.edp testFE-P3dc.edp \
bilapMorley.edp myType.edp testFE.edp \
convect_dervieux.edp testFEMorley.edp \
- testFE-PkEdge.edp \
+ testFE-PkEdge.edp metis.edp schwarz-nm.edp \
splitmesh3.cpp splitmesh3.edp splitmesh6.cpp splitmesh6.edp \
README_SuperLU \
tetgen.cpp\
@@@ -304,11 -305,12 +305,12 @@@
DxWriter.cpp metis.cpp pcm.cpp pcm.hpp pcm2rnm.cpp \
UMFPACK64.cpp iovtk.cpp gmsh.cpp MetricKuate.cpp \
ffnewuoa.cpp ffnewuoa.edp newuoa.f Element_P1dc1.cpp ilut.cpp ilut.edp \
- freeyams.cpp mmg3d.cpp mshmet.cpp \
+ freeyams.cpp mmg3d-v4.0.cpp mshmet.cpp \
BinaryIO.cpp gsl.cpp gsl.awk ff_gsl_awk.hpp isolineP1.cpp lg.pgm Leman-mesh.edp \
thresholdings.cpp thresholdings.edp \
VTK_writer_3d.cpp VTK_writer.cpp splitedges.cpp splitedges.edp \
- Element_Mixte.cpp LaplaceRT1.edp lame-TD-NSS.edp test-ElementMixte.edp
+ Element_Mixte.cpp LaplaceRT1.edp lame-TD-NSS.edp test-ElementMixte.edp \
+ myfunction2.cpp myfunction2.edp
LIST_COMPILE = myfunction.$(DYLIB_SUFFIX) BernadiRaugel.$(DYLIB_SUFFIX) \
Morley.$(DYLIB_SUFFIX) funcTemplate.$(DYLIB_SUFFIX) addNewType.$(DYLIB_SUFFIX) \
@@@ -325,12 -327,12 +327,12 @@@
Element_P1dc1.$(DYLIB_SUFFIX) BinaryIO.$(DYLIB_SUFFIX) \
isolineP1.$(DYLIB_SUFFIX) thresholdings.$(DYLIB_SUFFIX) \
VTK_writer_3d.$(DYLIB_SUFFIX) VTK_writer.$(DYLIB_SUFFIX) \
- splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX)
-
+ splitedges.$(DYLIB_SUFFIX) Element_Mixte.$(DYLIB_SUFFIX) \
+ myfunction2.$(DYLIB_SUFFIX)
LIST_COMPILE_PKG = tetgen.$(DYLIB_SUFFIX) SuperLu.$(DYLIB_SUFFIX) dfft.$(DYLIB_SUFFIX) \
metis.$(DYLIB_SUFFIX) UMFPACK64.$(DYLIB_SUFFIX) NewSolver.$(DYLIB_SUFFIX) \
lapack.$(DYLIB_SUFFIX) fflapack.$(DYLIB_SUFFIX) ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) \
- freeyams.$(DYLIB_SUFFIX) mmg3d.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
+ freeyams.$(DYLIB_SUFFIX) mmg3d-v4.0.$(DYLIB_SUFFIX) mshmet.$(DYLIB_SUFFIX) \
gsl.$(DYLIB_SUFFIX)
all: all-am
@@@ -671,8 -673,8 +673,8 @@@ makeref.edp: regtests.m4 ../regtests.m
all-local: all.edp regtests.edp load_compile
- all.edp:
- (echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
+ all.edp: Makefile
+ (echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
@@@ -707,6 -709,8 +709,8 @@@ ff-get-dep:ff-get-dep.in Makefil
WHERE_LIBRARY-download:ff-pkg-download FORCE WHERE_LIBRARY-config WHERE_LIBRARY
@./ff-pkg-download >$@-new
@diff $@-new $@ || (cp $@-new $@ ;touch WHERE_LIBRARY)
+ WHERE_LIBRARY:
+ touch $@
FORCE: ;
freefem++.pref:
echo loadpath = \"./\" >freefem++.pref
@@@ -717,7 -721,8 +721,7 @@@ install-exec-local:: load_compil
$(INSTALL_DATA) clapack.h ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(ff_prefix_dir)/include
$(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list