[freefempp] 02/04: Merge tag 'upstream/3.27'
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Mon Mar 3 16:37:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit 65a9bd8a84ff89a85a0cbd4d68c81c80020d419a
Merge: 9f800bf cd1963e
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Mar 3 13:30:30 2014 +0200
Merge tag 'upstream/3.27'
Upstream version 3.27
Conflicts:
._README_MAC
Makefile.in
configure
download/fftw/Makefile
examples++-load/Makefile.in
src/femlib/._splitsimplex.cpp
src/fflib/strversionnumber.cpp
._README_MAC | Bin 0 -> 171 bytes
._README_MAC.orig | Bin 0 -> 171 bytes
._TODO | Bin 0 -> 171 bytes
DOC/freefem++doc.pdf | Bin 9511418 -> 9569217 bytes
INNOVATION | 22 +-
Makefile.am | 2 +-
Makefile.in | 1140 ++
README_MAC | 10 +-
TODO | 4 +
WindowsPackage.m4 | 2 +
configure | 19555 +++++++++++++++++++++++++
configure.ac | 12 +-
download/fftw/Makefile | 283 +-
download/fftw/{Makefile => Makefile.orig} | 34 +-
download/ipopt/Makefile.inc.in | 2 +-
download/mshmet/Makefile-mshmet.inc | 2 +-
download/mumps-seq/Makefile | 2 +-
download/mumps-seq/Makefile-mumps-4.10.0.inc | 1 +
examples++-load/._Morley.cpp | Bin 0 -> 167 bytes
examples++-load/._fflapack.cpp | Bin 0 -> 171 bytes
examples++-load/._lapack.cpp | Bin 0 -> 171 bytes
examples++-load/._lapack.edp | Bin 0 -> 171 bytes
examples++-load/._msh3.cpp | Bin 0 -> 167 bytes
examples++-load/Makefile.am | 4 +-
examples++-load/Makefile.in | 1742 +++
examples++-load/ff-pkg-download.in | 5 +-
examples++-load/ff_gsl_awk.hpp | 1193 +-
examples++-load/fflapack.cpp | 33 +-
examples++-load/gsl.awk | 208 +-
examples++-load/gsl.cpp | 172 +-
examples++-load/gsl.edp | 124 +-
examples++-load/gsl.idp | 331 +
examples++-load/lapack.cpp | 27 +-
examples++-load/lapack.edp | 117 +-
examples++-load/msh3.cpp | 42 +-
examples++-mpi/._AddLayer2d.idp | Bin 0 -> 171 bytes
examples++-mpi/Laplace3d-hips.edp | 3 +-
examples++-tutorial/._mesh.edp | Bin 0 -> 171 bytes
examples++-tutorial/._sparse-matrix.edp | Bin 0 -> 171 bytes
examples++-tutorial/mesh.edp | 4 +-
examples++-tutorial/sparse-matrix.edp | 12 +
src/bamglib/Mesh2.cpp | 6 +-
src/bamglib/Mesh2.h | 1 +
src/femlib/._splitsimplex.cpp | Bin 0 -> 170 bytes
src/femlib/._splitsimplex.cpp.orig | Bin 0 -> 170 bytes
src/femlib/FESpacen.cpp | 4 +-
src/femlib/MatriceCreuse.hpp | 36 +-
src/femlib/MatriceCreuse_tpl.hpp | 14 +-
src/femlib/RNM.hpp | 2 +-
src/femlib/splitsimplex.cpp | 47 +-
src/fflib/._AFunction.cpp | Bin 0 -> 170 bytes
src/fflib/._lgfem.cpp | Bin 0 -> 170 bytes
src/fflib/._lgmat.cpp | Bin 0 -> 170 bytes
src/fflib/._lgmesh.cpp | Bin 0 -> 170 bytes
src/fflib/._problem.cpp | Bin 0 -> 170 bytes
src/fflib/AFunction.cpp | 3 +
src/fflib/lgmat.cpp | 192 +-
src/fflib/lgmesh.cpp | 119 +-
src/fflib/problem.cpp | 151 +-
src/fflib/problem.hpp | 8 +-
src/fflib/strversionnumber.cpp | 4 +-
61 files changed, 24837 insertions(+), 838 deletions(-)
diff --cc ._README_MAC.orig
index 0000000,14f037e..14f037e
mode 000000,100644..100644
Binary files differ
diff --cc download/fftw/Makefile.orig
index 1d8af13,0000000..8a9cd6d
mode 100644,000000..100644
--- a/download/fftw/Makefile.orig
+++ b/download/fftw/Makefile.orig
@@@ -1,595 -1,0 +1,625 @@@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# download/fftw/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+# Downloading and compiling extra libraries
+# -----------------------------------------
+
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/freefem++
+pkgincludedir = $(includedir)/freefem++
+pkglibdir = $(libdir)/freefem++
+pkglibexecdir = $(libexecdir)/freefem++
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
+subdir = download/fftw
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acmacros.m4 \
+ $(top_srcdir)/acoptim.m4 $(top_srcdir)/acmpi.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_$(V))
+am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing aclocal-1.14
+ADD_PACKAGE_NAME =
+AMTAR = $${TAR-tar}
+AM_DEFAULT_VERBOSITY = 1
+AR = ar
+ARFLAGS = rv
+ARPACKLIB =
+ARPACKLIBS = -larpack -llapack
+AUTOCONF = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoconf
+AUTOHEADER = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoheader
+AUTOMAKE = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing automake-1.14
+AWK = gawk
+BAMGPROG = bamg cvmsh2
+BLASINC =
+BLASLIBS = -lblas
+CC = gcc -Wl,-z,relro
+CCDEPMODE = depmode=none
+CFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+CFLAGSF77 = -DAdd_
+CNOFLAGS = -fPIC
+COMPILE_OPENBLAS =
+CPPFLAGS = -D_FORTIFY_SOURCE=2
+CXX = g++ -Wl,-z,relro
+CXXCPP = g++ -Wl,-z,relro -E
+CXXDEPMODE = depmode=none
+CXXFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -DBAMG_LONG_LONG -DNCHECKPTR -fPIC
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DOCPDF = freefem++doc.pdf
+DOCPS = freefem++doc.ps
+DOCPSGZ = freefem++doc.ps.gz
+DOWNLOADCOMPILE =
+DOWNLOADED_BLAS =
+DOWNLOADED_BLAS_BUILT_SOURCES =
+DOWNLOAD_ARPACK =
+DOWNLOAD_FFTW =
+DOWNLOAD_UMFPACK =
+DYLIB_SUFFIX = so
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+EGREP = /bin/grep -E
+EIGENOBJ = eigenvalue.$(OBJEXT)
+ENABLE_FFCS = no
+EPSTOPDF = epstopdf
+EXEEXT =
+F77 = gfortran
+FC = gfortran
+FCFLAGS = -g -O2 -fPIC
+FFGLUTNAME =
+FFGLUTPROG = ffglut
+FFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+FFMETIS_CFLAGS =
+FF_LAPACKdir =
+FF_MALLOC_H = 1
+FF_SECOND = second.o
+FF_STATIC_LIB =
+FF_UMFPACK_CONFIG =
+FLIBS = /usr/lib/gcc/x86_64-linux-gnu/4.8/libgfortran.so
+FNOFLAGS = -fPIC
+G2CLIB = /usr/lib/gcc/x86_64-linux-gnu/4.8/libgfortran.so
+GCCNOCYGWIN =
+GREP = /bin/grep
+HISTORY =
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+KERNEL_VERSION = 4.8.2
+LAPACKLIBS =
+LAPACK_arpack_LIB =
+LDFLAGS = -Wl,-z,relro -rdynamic
+LEX = flex
+LEXLIB =
+LEX_OUTPUT_ROOT = lex.yy
+LIBC_VERSION = libc-2.17
+LIBOBJS =
+LIBS = -ldl -lm /usr/lib/gcc/x86_64-linux-gnu/4.8/libgfortran.so
+LIBSGLUT = -lglut -lGLU -lGL
+LIBSNOCONSOLE =
+LIBSPTHREAD = -lpthread
+LOAD_COMPILE = load_compile
+LOAD_TESTS = ../regtests.sh
+LTLIBOBJS =
+MAINT = #
+MAKEINFO = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing makeinfo
+MEDITPROG = ffmedit
+MKDIR_P = /bin/mkdir -p
+MPICC = /usr/bin/mpicc
+MPICXX = mpic++ -Wl,-z,relro
+MPIF77 = /usr/bin/mpif90
+MPIFC = /usr/bin/mpif90
+MPIPROG = FreeFem++-mpi
+MPIRUN = /usr/bin/mpirun
+MPISCRIPT = ff-mpirun
+MPI_INCLUDE =
+MPI_INC_DIR =
+MPI_LIB = -Wl,-z,relro
+MPI_LIBC =
+MPI_LIBFC = -pthread -L/usr//lib -L/usr/lib/openmpi/lib -lmpi_f90 -lmpi_f77 -lmpi -ldl -lhwloc
+MPI_LIB_DIRS =
+NO_RANGE_CHECK =
+OBJEXT = o
+OPTIM_TYPE =
+PACKAGE = fftw-$(FFTW_VERSION).tar.gz
+PACKAGE_BUGREPORT = hecht at ann.jussieu.fr
+PACKAGE_NAME = FreeFem++
- PACKAGE_STRING = FreeFem++ 3.26-2
++PACKAGE_STRING = FreeFem++ 3.27
+PACKAGE_TARNAME = freefem++
+PACKAGE_URL =
- PACKAGE_VERSION = 3.26-2
++PACKAGE_VERSION = 3.27
+PASTIX_HOSTARCH =
+PATH_SEPARATOR = :
+RANLIB = ranlib
+RANLIN = ranlib
+SCOTCH_INCLUDE = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/include/scotch
+SET_MAKE =
+SHELL = /bin/bash
+SIZEOF_INT = 4
+SIZEOF_LONG = 8
+SIZEOF_PTR = 8
+SIZEOF_PTRINBIT = 64
+SKIP_TESTS_EIGEN =
+SKIP_TESTS_MPI = no
+STATICTOOL =
+STDPROG =
+STD_GRAPH_OBJ =
+STD_LDFLAGS =
+STD_LIBS =
+STRIP =
+TEST_FFPP = ../src/nw/FreeFem++
+TEST_FFPPMPI = ../src/mpi/ff-mpirun
+TOOL_COMPILE_fflapack = fflapack
+TOOL_COMPILE_gsl = gsl
+TOOL_COMPILE_hips = hips
+TOOL_COMPILE_ipopt = ipopt
+TOOL_COMPILE_lapack = lapack
+TOOL_COMPILE_metis = metis
+TOOL_COMPILE_mmg3d = mmg3d
+TOOL_COMPILE_mshmet = mshmet
+TOOL_COMPILE_mumps = mumps
+TOOL_COMPILE_mumps_seq = mumps-seq
+TOOL_COMPILE_nlopt = nlopt
+TOOL_COMPILE_pardiso = pardiso
+TOOL_COMPILE_parmetis = parmetis
+TOOL_COMPILE_parms = parms
+TOOL_COMPILE_pastix = pastix
+TOOL_COMPILE_pipe = pipe
+TOOL_COMPILE_scotch = scotch
+TOOL_COMPILE_superlu = superlu
+TOOL_COMPILE_superludist = superludist
+TOOL_COMPILE_umfpack = umfpack
+TOOL_COMPILE_yams = yams
++<<<<<<< HEAD
+TOOL_DYLIB_fflapack = fflapack.so
+TOOL_DYLIB_gsl =
+TOOL_DYLIB_hips = hips_FreeFem.so
+TOOL_DYLIB_ipopt = ff-Ipopt.so
+TOOL_DYLIB_lapack = lapack.so
+TOOL_DYLIB_metis = metis.so
+TOOL_DYLIB_mmg3d = mmg3d-v4.0.so
+TOOL_DYLIB_mshmet = mshmet.so
+TOOL_DYLIB_mumps = MUMPS_FreeFem.so MUMPS.so
+TOOL_DYLIB_mumps_seq = MUMPS_seq.so
+TOOL_DYLIB_nlopt = ff-NLopt.so
+TOOL_DYLIB_pardiso =
+TOOL_DYLIB_parmetis =
+TOOL_DYLIB_parms = parms_FreeFem.so
+TOOL_DYLIB_pastix = interfacepastix.so complex_pastix_FreeFem.so real_pastix_FreeFem.so
+TOOL_DYLIB_pipe = pipe.so
+TOOL_DYLIB_scotch = scotch.so
+TOOL_DYLIB_superlu = SuperLu.so
+TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.so real_SuperLU_DIST_FreeFem.so dSuperLU_DIST.so
+TOOL_DYLIB_umfpack = UMFPACK64.so
+TOOL_DYLIB_yams = freeyams.so
+UMFPACKLIBS = -lumfpack -lamd -lcholmod -lcolamd
+VERSION = 3.26-2
++=======
++TOOL_DYLIB_fflapack = fflapack.dylib
++TOOL_DYLIB_gsl = gsl.dylib NewSolver.dylib
++TOOL_DYLIB_hips = hips_FreeFem.dylib
++TOOL_DYLIB_ipopt = ff-Ipopt.dylib
++TOOL_DYLIB_lapack = lapack.dylib
++TOOL_DYLIB_metis = metis.dylib
++TOOL_DYLIB_mmg3d = mmg3d-v4.0.dylib
++TOOL_DYLIB_mshmet = mshmet.dylib
++TOOL_DYLIB_mumps = MUMPS_FreeFem.dylib MUMPS.dylib
++TOOL_DYLIB_mumps_seq = MUMPS_seq.dylib
++TOOL_DYLIB_nlopt = ff-NLopt.dylib
++TOOL_DYLIB_pardiso =
++TOOL_DYLIB_parmetis =
++TOOL_DYLIB_parms = parms_FreeFem.dylib
++TOOL_DYLIB_pastix = interfacepastix.dylib complex_pastix_FreeFem.dylib real_pastix_FreeFem.dylib
++TOOL_DYLIB_pipe = pipe.dylib
++TOOL_DYLIB_scotch = scotch.dylib
++TOOL_DYLIB_superlu = SuperLu.dylib
++TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.dylib real_SuperLU_DIST_FreeFem.dylib dSuperLU_DIST.dylib
++TOOL_DYLIB_umfpack = UMFPACK64.dylib
++TOOL_DYLIB_yams = freeyams.dylib
++UMFPACKLIBS = -L/Users/hecht/work/ff++/download/lib -lumfpack -lcholmod -lcolamd -lamd -lsuitesparseconfig
++VERSION = 3.27
++>>>>>>> upstream/3.27
+WGET = wget --no-check-certificate
+WIN32DLLTARGET =
+WINDRESOBJ =
+YACC = bison -y
+YFLAGS =
+abs_builddir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/fftw
+abs_srcdir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/fftw
+abs_top_builddir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
+abs_top_srcdir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
+ac_ct_CC = gcc -Wl,-z,relro
+ac_ct_CXX =
+ac_ct_F77 = gfortran
+ac_ct_FC = gfortran
+am__include = include
+am__leading_dot = .
+am__quote =
+am__tar = $${TAR-tar} chof - "$$tardir"
+am__untar = $${TAR-tar} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-pc-linux-gnu
+build_alias = x86_64-linux-gnu
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = pc
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+ff_bison = yes
+ff_convert = yes
+ff_curl =
+ff_dvips = yes
+ff_git =
+ff_gzip = yes
+ff_history =
+ff_latex = yes
+ff_libtool = yes
+ff_m4 = yes
+ff_makeindex = yes
+ff_patch = yes
+ff_pdf2ps = yes
+ff_pdflatex = yes
++<<<<<<< HEAD
+ff_prefix_dir = /usr/lib/ff++/3.26-2
++=======
++ff_prefix_dir = /usr/local/lib/ff++/3.27
++>>>>>>> upstream/3.27
+ff_unzip =
+ff_wget = yes
+host = x86_64-pc-linux-gnu
+host_alias =
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${prefix}/share/info
+install_sh = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/install-sh
+libdir = ${prefix}/lib/x86_64-linux-gnu
+libexecdir = ${prefix}/lib/x86_64-linux-gnu
+localedir = ${datarootdir}/locale
+localstatedir = /var
+mandir = ${prefix}/share/man
+mkdir_p = $(MKDIR_P)
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = /etc
+target_alias =
+top_build_prefix = ../../
+top_builddir = ../..
+top_srcdir = ../..
+
+# Downloading and compiling FFTW
+# ------------------------------
+
+# FFTW information
+FFTW_VERSION = 3.3.2
+SRCDIR = fftw-$(FFTW_VERSION)
+SERVER = http://www.fftw.org
+THIS = fftw3
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu download/fftw/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu download/fftw/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_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
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile all-local
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-local mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local check check-am clean clean-generic \
+ clean-local cscopelist-am ctags-am distclean distclean-generic \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am
+
+
+all-local: $(DOWNLOAD_FFTW)
+
+fftw: $(SRCDIR)/FAIT WHERE
+ $(MAKE) WHERE
+
+$(SRCDIR)/FAIT:$(SRCDIR)/FAIT-1
+ cd $(SRCDIR) && ./configure --disable-dependency-tracking --disable-fortran --prefix=`pwd`/../.. CXX="$(CXX)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP='gcc -E' CXXFLAGS="$(CXXFLAGS)"
+ cd $(SRCDIR) && make
+ cd $(SRCDIR) && make install
+ touch $(SRCDIR)/FAIT
+
+$(SRCDIR)/FAIT-1:../pkg/$(PACKAGE)
+ tar xvzf ../pkg/$(PACKAGE)
+ touch $(SRCDIR)/FAIT-1
+
+../pkg/$(PACKAGE):
+ -mkdir ../pkg
+ cd ../pkg;wget --no-check-certificate -N $(SERVER)/$(PACKAGE)
+
+WHERE:$(SRCDIR)/FAIT
+ -if [ $(SRCDIR)/FAIT ] ; then \
+ echo $(THIS) LD -L at DIR@/lib -l$(THIS) >../lib/WHERE.$(THIS) ;\
+ echo $(THIS) INCLUDE -I at DIR@/include >> ../lib/WHERE.$(THIS) ;\
+ fi
+
+clean-local:
+ -rm -rf fftw-*
+ -rm ../include/fftw3.f ../include/fftw3.f03 ../include/fftw3.h ../include/fftw3l.f03 ../include/fftw3q.f03 \
+ ../lib/libfftw3.a ../lib/libfftw3.la
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --cc src/femlib/._splitsimplex.cpp.orig
index 0000000,e9604e8..e9604e8
mode 000000,100644..100644
Binary files differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list