[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-0.9.2+darcs081022-dfsg.1-5-76-g62d10f6

Drew Parsons dparsons at debian.org
Tue May 26 09:25:15 UTC 2009


The following commit has been merged in the debian-unstable branch:
commit 8107e4756bd203529cb1944b3d9c5426f6822f94
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue May 26 19:11:47 2009 +1000

    Remove fpucontrol-bug350595.patch, fes2004 licence entry.
    
    fpucontrol-bug350595.patch superseded: src/init.c now uses
    fenv.h instead of fpu_control.h.  Closes: #525396.
    
    Also, autoreconf to register fes2004 removal.

diff --git a/configure b/configure
index 8e998a9..f5de42d 100755
--- a/configure
+++ b/configure
@@ -17147,7 +17147,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/gfs-config src/gerris2D.pc src/gerris2D3.pc src/gerris3D.pc tools/Makefile modules/Makefile modules/fes2004/Makefile modules/wavewatch/Makefile test/Makefile doc/Makefile doc/tutorial/Makefile doc/examples/Makefile doc/manpages/Makefile doc/examples/gfs2doc doc/examples/gfs-highlight doc/examples/crossref.sh desktop/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/gfs-config src/gerris2D.pc src/gerris2D3.pc src/gerris3D.pc tools/Makefile modules/Makefile modules/wavewatch/Makefile test/Makefile doc/Makefile doc/tutorial/Makefile doc/examples/Makefile doc/manpages/Makefile doc/examples/gfs2doc doc/examples/gfs-highlight doc/examples/crossref.sh desktop/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18179,7 +18179,6 @@ do
     "src/gerris3D.pc") CONFIG_FILES="$CONFIG_FILES src/gerris3D.pc" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
-    "modules/fes2004/Makefile") CONFIG_FILES="$CONFIG_FILES modules/fes2004/Makefile" ;;
     "modules/wavewatch/Makefile") CONFIG_FILES="$CONFIG_FILES modules/wavewatch/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
diff --git a/debian/changelog b/debian/changelog
index afde666..7a93a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,15 @@ gerris (20090512-dfsg.1-1) UNRELEASED; urgency=low
     - upstream now releases snapshots only, rather than versioned
       releases, so upstream version is given by release date: 20090512.
     - modules/RStarTree has no free licence, so has been removed.
+    - likewise modules/fes2004 removed: uses non-free Aktarus tide
+      prediction functions.
+    - fpucontrol-bug350595.patch superseded: src/init.c now uses
+      fenv.h instead of fpu_control.h.  Closes: #525396.
   * debian/copyright lists licences for modules:
-      - fes2004: GPLv2
       - wavewatch: public domain
       	(see http://polar.ncep.noaa.gov/waves/wavewatch/wavewatch.html )
 
- -- Drew Parsons <dparsons at debian.org>  Tue, 26 May 2009 17:49:27 +1000
+ -- Drew Parsons <dparsons at debian.org>  Tue, 26 May 2009 19:00:15 +1000
 
 gerris (0.9.2+darcs081022-dfsg.1-5) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index d152ccd..4f13b19 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,26 +45,6 @@ Modules
 
 Separate modules containing third-party source are found in the modules source subdir.
 
-modules/fes2004: 
----------------
-
-GNU General Public License v2, see /usr/share/common-licenses/GPL-2.
-
-The FES2004_distribution_soft-1.0.2 was written by :
-
-Thierry LETELLIER  (tletelli  @  notos.cst.cnes.fr)
-LEGOS Toulouse FRANCE
-in October 2005
-
-The FES2004_distribution_soft-1.0.2 used some functions from Aktarus library
-The Aktarus library was written by :
-
-Thierry LETELLIER and Laurent ROBLOU
-LEGOS Toulouse FRANCE
-in 2003
-(tletelli  @  notos.cst.cnes.fr) and (laurent.roblou @  noveltis.fr)
-
-
 modules/wavewatch:
 -----------------
                   +-----------------------------------+
@@ -89,3 +69,16 @@ Consequently the modules using RStarTree are not built.
 This includes the terrain module and the module binaries xyz2rsurface, 
 rsurfacequery and rsurfacedraw.
 
+
+modules/fes2004: 
+---------------
+
+fes2004 itself is GPLv2 but uses tide prediction functions from Aktarus, 
+which is explicitly non-free.
+
+    fes2004_kernel.c: "You don't have the right to  use these functions in
+        other programs than the FES2004 prediction."
+
+modules/fes2004 has therefore been removed from the Debian source tarball, 
+and the tides module is not built.
+
diff --git a/debian/patches/fpucontrol-bug350595.patch b/debian/patches/fpucontrol-bug350595.patch
deleted file mode 100644
index 2640a33..0000000
--- a/debian/patches/fpucontrol-bug350595.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/init.c b/src/init.c
-index 6d328d4..6fea3e1 100644
-diff -Nur -x '*.orig' -x '*~' gerris/src/init.c gerris.new/src/init.c
---- gerris/src/init.c	2009-04-11 02:17:24.000000000 +1000
-+++ gerris.new/src/init.c	2009-04-23 15:30:47.000000000 +1000
-@@ -19,11 +19,28 @@
- 
- #include "config.h"
- 
-+#if defined(__ARM_EABI__) && defined(__SOFTFP__)
-+    /* ARM EABI soft float silently returns infinities on division by zero */
-+    /* _FPU_SETCW uses arm-specific instructions which are not valid on armel,
-+     * therefore exclude armel from fpu manipulations*/
-+#undef FPU_AVAILABLE
-+#else
- #ifdef HAVE_FPU_SETCW
- # include <fpu_control.h>
-+#ifdef _FPU_IEEE
-+#define FPU_AVAILABLE
-   static fpu_control_t fpu_trap_exceptions = 
--       _FPU_IEEE & ~(_FPU_MASK_ZM /*| _FPU_MASK_IM | _FPU_MASK_OM*/);
-+     _FPU_IEEE &
-+#ifdef __mc68000__
-+     ~(_FPU_MASK_DZ /*| _FPU_MASK_OPERR | _FPU_MASK_OVFL*/);
-+#elif defined(__mips__)
-+     ~(_FPU_MASK_Z /*| _FPU_MASK_V | _FPU_MASK_O*/);
-+#else
-+     ~(_FPU_MASK_ZM /*| _FPU_MASK_IM | _FPU_MASK_OM*/);
-+#endif
-+#endif /* _FPU_IEEE */
- #endif /* HAVE_FPU_SETCW */
-+#endif /* __ARM_EABI__ */
- 
- #include <stdlib.h>
- #include <locale.h>
-@@ -260,9 +277,9 @@
- #endif /* HAVE_MPI */
-   initialized = TRUE;
- 
--#ifdef HAVE_FPU_SETCW
-+#ifdef FPU_AVAILABLE
-    _FPU_SETCW (fpu_trap_exceptions);
--#endif /* HAVE_FPU_SETCW */
-+#endif /* FPU_AVAILABLE */
- 
-   g_log_set_handler (G_LOG_DOMAIN,
- 		     G_LOG_LEVEL_ERROR |
diff --git a/modules/Makefile.in b/modules/Makefile.in
index a80c734..df219f1 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -77,28 +77,6 @@ libstokes3D_la_LIBADD =
 am_libstokes3D_la_OBJECTS = libstokes3D_la-stokes.lo CW263.lo
 libstokes3D_la_OBJECTS = $(am_libstokes3D_la_OBJECTS)
 @BUILD_STOKES_TRUE at am_libstokes3D_la_rpath = -rpath $(pkglibdir)
-am__DEPENDENCIES_1 =
-libtide2D_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libtide2D_la_OBJECTS = libtide2D_la-tide.lo
-libtide2D_la_OBJECTS = $(am_libtide2D_la_OBJECTS)
-libtide2D_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtide2D_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- at BUILD_TIDE_TRUE@am_libtide2D_la_rpath = -rpath $(pkglibdir)
-libtide2D3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libtide2D3_la_OBJECTS = libtide2D3_la-tide.lo
-libtide2D3_la_OBJECTS = $(am_libtide2D3_la_OBJECTS)
-libtide2D3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtide2D3_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- at BUILD_TIDE_TRUE@am_libtide2D3_la_rpath = -rpath $(pkglibdir)
-libtide3D_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libtide3D_la_OBJECTS = libtide3D_la-tide.lo
-libtide3D_la_OBJECTS = $(am_libtide3D_la_OBJECTS)
-libtide3D_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtide3D_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- at BUILD_TIDE_TRUE@am_libtide3D_la_rpath = -rpath $(pkglibdir)
 am_libwavewatch2D_la_OBJECTS = libwavewatch2D_la-wavewatch.lo
 libwavewatch2D_la_OBJECTS = $(am_libwavewatch2D_la_OBJECTS)
 libwavewatch2D_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -127,14 +105,10 @@ F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(libmap2D_la_SOURCES) $(libmap2D3_la_SOURCES) \
 	$(libmap3D_la_SOURCES) $(libstokes2D_la_SOURCES) \
-	$(libstokes3D_la_SOURCES) $(libtide2D_la_SOURCES) \
-	$(libtide2D3_la_SOURCES) $(libtide3D_la_SOURCES) \
-	$(libwavewatch2D_la_SOURCES)
+	$(libstokes3D_la_SOURCES) $(libwavewatch2D_la_SOURCES)
 DIST_SOURCES = $(libmap2D_la_SOURCES) $(libmap2D3_la_SOURCES) \
 	$(libmap3D_la_SOURCES) $(libstokes2D_la_SOURCES) \
-	$(libstokes3D_la_SOURCES) $(libtide2D_la_SOURCES) \
-	$(libtide2D3_la_SOURCES) $(libtide3D_la_SOURCES) \
-	$(libwavewatch2D_la_SOURCES)
+	$(libstokes3D_la_SOURCES) $(libwavewatch2D_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -294,13 +268,15 @@ top_srcdir = @top_srcdir@
 use_mpicc = @use_mpicc@
 
 #SUBDIRS = RStarTree fes2004 wavewatch
-SUBDIRS = fes2004 wavewatch
+SUBDIRS = wavewatch
 AM_CPPFLAGS = -DGFS_MODULES_DIR=\"$(libdir)/gerris\"
 INCLUDES = -I$(top_srcdir)/src -I$(includedir) \
            -DG_LOG_DOMAIN=\"Gfs-modules\" $(GTS_CFLAGS)
 
 @HAS_LIBPROJ_TRUE at MAP = libmap2D.la libmap3D.la libmap2D3.la
- at BUILD_TIDE_TRUE@TIDE = libtide2D.la libtide3D.la libtide2D3.la
+#if BUILD_TIDE
+#TIDE = libtide2D.la libtide3D.la libtide2D3.la
+#endif
 @BUILD_STOKES_TRUE at STOKES = libstokes2D.la libstokes3D.la
 @BUILD_WAVEWATCH_TRUE at WAVEWATCH = libwavewatch2D.la
 pkglib_LTLIBRARIES = \
@@ -357,15 +333,16 @@ libmap2D3_la_LIBADD = -lproj
 #libterrain2D3_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D3=1
 #libterrain2D3_la_LIBADD = -LRStarTree -lcSmRST
 #libterrain2D3_la_DEPENDENCIES = RStarTree/libcSmRST.la
-libtide3D_la_SOURCES = tide.c
-libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
-libtide3D_la_LIBADD = -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
-libtide2D_la_SOURCES = tide.c
-libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1
-libtide2D_la_LIBADD = -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
-libtide2D3_la_SOURCES = tide.c
-libtide2D3_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D3=1
-libtide2D3_la_LIBADD = -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
+
+#libtide3D_la_SOURCES = tide.c
+#libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
+#libtide3D_la_LIBADD = -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
+#libtide2D_la_SOURCES = tide.c
+#libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1
+#libtide2D_la_LIBADD = -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
+#libtide2D3_la_SOURCES = tide.c
+#libtide2D3_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D3=1
+#libtide2D3_la_LIBADD = -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)
 libstokes3D_la_SOURCES = stokes.c CW263.f
 libstokes3D_la_CFLAGS = $(AM_CFLAGS)
 libstokes2D_la_SOURCES = stokes.c CW263.f
@@ -445,12 +422,6 @@ libstokes2D.la: $(libstokes2D_la_OBJECTS) $(libstokes2D_la_DEPENDENCIES)
 	$(F77LINK) $(am_libstokes2D_la_rpath) $(libstokes2D_la_OBJECTS) $(libstokes2D_la_LIBADD) $(LIBS)
 libstokes3D.la: $(libstokes3D_la_OBJECTS) $(libstokes3D_la_DEPENDENCIES) 
 	$(F77LINK) $(am_libstokes3D_la_rpath) $(libstokes3D_la_OBJECTS) $(libstokes3D_la_LIBADD) $(LIBS)
-libtide2D.la: $(libtide2D_la_OBJECTS) $(libtide2D_la_DEPENDENCIES) 
-	$(libtide2D_la_LINK) $(am_libtide2D_la_rpath) $(libtide2D_la_OBJECTS) $(libtide2D_la_LIBADD) $(LIBS)
-libtide2D3.la: $(libtide2D3_la_OBJECTS) $(libtide2D3_la_DEPENDENCIES) 
-	$(libtide2D3_la_LINK) $(am_libtide2D3_la_rpath) $(libtide2D3_la_OBJECTS) $(libtide2D3_la_LIBADD) $(LIBS)
-libtide3D.la: $(libtide3D_la_OBJECTS) $(libtide3D_la_DEPENDENCIES) 
-	$(libtide3D_la_LINK) $(am_libtide3D_la_rpath) $(libtide3D_la_OBJECTS) $(libtide3D_la_LIBADD) $(LIBS)
 libwavewatch2D.la: $(libwavewatch2D_la_OBJECTS) $(libwavewatch2D_la_DEPENDENCIES) 
 	$(libwavewatch2D_la_LINK) $(am_libwavewatch2D_la_rpath) $(libwavewatch2D_la_OBJECTS) $(libwavewatch2D_la_LIBADD) $(LIBS)
 
@@ -464,9 +435,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmap2D_la-map.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libstokes2D_la-stokes.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libstokes3D_la-stokes.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtide2D3_la-tide.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtide2D_la-tide.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtide3D_la-tide.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libwavewatch2D_la-wavewatch.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/map.Plo at am__quote@
 
@@ -519,27 +487,6 @@ libstokes3D_la-stokes.lo: stokes.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libstokes3D_la_CFLAGS) $(CFLAGS) -c -o libstokes3D_la-stokes.lo `test -f 'stokes.c' || echo '$(srcdir)/'`stokes.c
 
-libtide2D_la-tide.lo: tide.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtide2D_la_CFLAGS) $(CFLAGS) -MT libtide2D_la-tide.lo -MD -MP -MF $(DEPDIR)/libtide2D_la-tide.Tpo -c -o libtide2D_la-tide.lo `test -f 'tide.c' || echo '$(srcdir)/'`tide.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtide2D_la-tide.Tpo $(DEPDIR)/libtide2D_la-tide.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tide.c' object='libtide2D_la-tide.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtide2D_la_CFLAGS) $(CFLAGS) -c -o libtide2D_la-tide.lo `test -f 'tide.c' || echo '$(srcdir)/'`tide.c
-
-libtide2D3_la-tide.lo: tide.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtide2D3_la_CFLAGS) $(CFLAGS) -MT libtide2D3_la-tide.lo -MD -MP -MF $(DEPDIR)/libtide2D3_la-tide.Tpo -c -o libtide2D3_la-tide.lo `test -f 'tide.c' || echo '$(srcdir)/'`tide.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtide2D3_la-tide.Tpo $(DEPDIR)/libtide2D3_la-tide.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tide.c' object='libtide2D3_la-tide.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtide2D3_la_CFLAGS) $(CFLAGS) -c -o libtide2D3_la-tide.lo `test -f 'tide.c' || echo '$(srcdir)/'`tide.c
-
-libtide3D_la-tide.lo: tide.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtide3D_la_CFLAGS) $(CFLAGS) -MT libtide3D_la-tide.lo -MD -MP -MF $(DEPDIR)/libtide3D_la-tide.Tpo -c -o libtide3D_la-tide.lo `test -f 'tide.c' || echo '$(srcdir)/'`tide.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtide3D_la-tide.Tpo $(DEPDIR)/libtide3D_la-tide.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tide.c' object='libtide3D_la-tide.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtide3D_la_CFLAGS) $(CFLAGS) -c -o libtide3D_la-tide.lo `test -f 'tide.c' || echo '$(srcdir)/'`tide.c
-
 libwavewatch2D_la-wavewatch.lo: wavewatch.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwavewatch2D_la_CFLAGS) $(CFLAGS) -MT libwavewatch2D_la-wavewatch.lo -MD -MP -MF $(DEPDIR)/libwavewatch2D_la-wavewatch.Tpo -c -o libwavewatch2D_la-wavewatch.lo `test -f 'wavewatch.c' || echo '$(srcdir)/'`wavewatch.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libwavewatch2D_la-wavewatch.Tpo $(DEPDIR)/libwavewatch2D_la-wavewatch.Plo
diff --git a/modules/fes2004/Makefile.in b/modules/fes2004/Makefile.in
deleted file mode 100644
index 2f4e6e6..0000000
--- a/modules/fes2004/Makefile.in
+++ /dev/null
@@ -1,544 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-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 = @build@
-host_triplet = @host@
-subdir = modules/fes2004
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING ChangeLog NEWS
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libfes_la_LIBADD =
-am_libfes_la_OBJECTS = libfes_la-fes2004_alloc.lo \
-	libfes_la-fes2004_error.lo libfes_la-fes2004_extraction.lo \
-	libfes_la-fes2004_init.lo libfes_la-fes2004_io.lo \
-	libfes_la-fes2004_prediction.lo libfes_la-fes2004_kernel.lo
-libfes_la_OBJECTS = $(am_libfes_la_OBJECTS)
-libfes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libfes_la_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- at BUILD_TIDE_TRUE@am_libfes_la_rpath =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libfes_la_SOURCES)
-DIST_SOURCES = $(libfes_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FGREP = @FGREP@
-GFS2D3_LIBS = @GFS2D3_LIBS@
-GFS2D_LIBS = @GFS2D_LIBS@
-GFS3D_LIBS = @GFS3D_LIBS@
-GFS_COMPILATION_FLAGS = @GFS_COMPILATION_FLAGS@
-GFS_MAJOR_VERSION = @GFS_MAJOR_VERSION@
-GFS_MICRO_VERSION = @GFS_MICRO_VERSION@
-GFS_MINOR_VERSION = @GFS_MINOR_VERSION@
-GFS_VERSION = @GFS_VERSION@
-GREP = @GREP@
-GSL_CFLAGS = @GSL_CFLAGS@
-GSL_CONFIG = @GSL_CONFIG@
-GSL_LIBS = @GSL_LIBS@
-GTS_CFLAGS = @GTS_CFLAGS@
-GTS_CONFIG = @GTS_CONFIG@
-GTS_DEPLIBS = @GTS_DEPLIBS@
-GTS_LIBS = @GTS_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULES = @MODULES@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNDEFINED = @NO_UNDEFINED@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gts_cflags = @gts_cflags@
-gts_libs = @gts_libs@
-have_awk = @have_awk@
-have_gmodule = @have_gmodule@
-have_m4 = @have_m4@
-have_pkg_config = @have_pkg_config@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-use_mpicc = @use_mpicc@
- at BUILD_TIDE_TRUE@TIDE = libfes.la
-noinst_LTLIBRARIES = $(TIDE)
-libfes_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
-libfes_la_SOURCES = \
-	fes2004_alloc.c \
-	fes2004_error.c \
-	fes2004_extraction.c \
-	fes2004_init.c \
-	fes2004_io.c \
-	fes2004_prediction.c \
-	fes2004_kernel.c \
-	fes.h \
-	fes2004_lib.h
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(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  modules/fes2004/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/fes2004/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libfes.la: $(libfes_la_OBJECTS) $(libfes_la_DEPENDENCIES) 
-	$(libfes_la_LINK) $(am_libfes_la_rpath) $(libfes_la_OBJECTS) $(libfes_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_alloc.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_error.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_extraction.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_init.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_io.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_kernel.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfes_la-fes2004_prediction.Plo at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
- at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libfes_la-fes2004_alloc.lo: fes2004_alloc.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_alloc.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_alloc.Tpo -c -o libfes_la-fes2004_alloc.lo `test -f 'fes2004_alloc.c' || echo '$(srcdir)/'`fes2004_alloc.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_alloc.Tpo $(DEPDIR)/libfes_la-fes2004_alloc.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_alloc.c' object='libfes_la-fes2004_alloc.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_alloc.lo `test -f 'fes2004_alloc.c' || echo '$(srcdir)/'`fes2004_alloc.c
-
-libfes_la-fes2004_error.lo: fes2004_error.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_error.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_error.Tpo -c -o libfes_la-fes2004_error.lo `test -f 'fes2004_error.c' || echo '$(srcdir)/'`fes2004_error.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_error.Tpo $(DEPDIR)/libfes_la-fes2004_error.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_error.c' object='libfes_la-fes2004_error.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_error.lo `test -f 'fes2004_error.c' || echo '$(srcdir)/'`fes2004_error.c
-
-libfes_la-fes2004_extraction.lo: fes2004_extraction.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_extraction.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_extraction.Tpo -c -o libfes_la-fes2004_extraction.lo `test -f 'fes2004_extraction.c' || echo '$(srcdir)/'`fes2004_extraction.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_extraction.Tpo $(DEPDIR)/libfes_la-fes2004_extraction.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_extraction.c' object='libfes_la-fes2004_extraction.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_extraction.lo `test -f 'fes2004_extraction.c' || echo '$(srcdir)/'`fes2004_extraction.c
-
-libfes_la-fes2004_init.lo: fes2004_init.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_init.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_init.Tpo -c -o libfes_la-fes2004_init.lo `test -f 'fes2004_init.c' || echo '$(srcdir)/'`fes2004_init.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_init.Tpo $(DEPDIR)/libfes_la-fes2004_init.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_init.c' object='libfes_la-fes2004_init.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_init.lo `test -f 'fes2004_init.c' || echo '$(srcdir)/'`fes2004_init.c
-
-libfes_la-fes2004_io.lo: fes2004_io.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_io.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_io.Tpo -c -o libfes_la-fes2004_io.lo `test -f 'fes2004_io.c' || echo '$(srcdir)/'`fes2004_io.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_io.Tpo $(DEPDIR)/libfes_la-fes2004_io.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_io.c' object='libfes_la-fes2004_io.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_io.lo `test -f 'fes2004_io.c' || echo '$(srcdir)/'`fes2004_io.c
-
-libfes_la-fes2004_prediction.lo: fes2004_prediction.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_prediction.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_prediction.Tpo -c -o libfes_la-fes2004_prediction.lo `test -f 'fes2004_prediction.c' || echo '$(srcdir)/'`fes2004_prediction.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_prediction.Tpo $(DEPDIR)/libfes_la-fes2004_prediction.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_prediction.c' object='libfes_la-fes2004_prediction.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_prediction.lo `test -f 'fes2004_prediction.c' || echo '$(srcdir)/'`fes2004_prediction.c
-
-libfes_la-fes2004_kernel.lo: fes2004_kernel.c
- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -MT libfes_la-fes2004_kernel.lo -MD -MP -MF $(DEPDIR)/libfes_la-fes2004_kernel.Tpo -c -o libfes_la-fes2004_kernel.lo `test -f 'fes2004_kernel.c' || echo '$(srcdir)/'`fes2004_kernel.c
- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libfes_la-fes2004_kernel.Tpo $(DEPDIR)/libfes_la-fes2004_kernel.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fes2004_kernel.c' object='libfes_la-fes2004_kernel.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfes_la_CFLAGS) $(CFLAGS) -c -o libfes_la-fes2004_kernel.lo `test -f 'fes2004_kernel.c' || echo '$(srcdir)/'`fes2004_kernel.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-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 $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$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 $(LTLIBRARIES)
-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:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-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
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags 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-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-# 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:

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list