[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-20091109-dfsg.1-2-5-gaf90fcb

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit ef95a55e4c6f6e28f31c9597c5bff83c47b2bee3
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Apr 6 15:39:15 2011 +1000

    remove RStartTree and FES references in module build
    
    Already removed the modules themselves, but also need to stop building
    the module binaries which use them
      rsurface tools, libterrain:  RStarTree
      tide: fes2004
    
    KDTLIB references RStarTree, but the kdt module does not, so we still
    build it, removing the RStarTree reference
    (cherry picked from commit 85bdca466e8312472337b41a882b0d05d05926c6)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 9b7c7c4..9126762 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -38,8 +38,6 @@ endif
 
 pkglib_LTLIBRARIES = \
 	$(MAP) \
-	libterrain2D.la \
-	libterrain3D.la \
 	libparticulates2D.la \
 	libparticulates3D.la \
 	libokada2D.la \
@@ -47,7 +45,6 @@ pkglib_LTLIBRARIES = \
 	libdf33D.la \
 	libelectrohydro2D.la \
 	libelectrohydro3D.la \
-	$(TIDE) \
 	$(STOKES) \
 	$(WAVEWATCH) \
 	$(HYPRE) \
@@ -56,12 +53,6 @@ pkglib_LTLIBRARIES = \
 	$(ODE) \
         $(BUBBLES)
 
-bin_PROGRAMS = \
-	xyz2rsurface \
-	rsurfacequery \
-	rsurfacedraw \
-	rsurfaceinfo
-
 EXTRA_DIST = \
 	map.mod \
 	tide.mod \
@@ -104,24 +95,8 @@ libmap2D_la_SOURCES = map.c
 libmap2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
 libmap2D_la_LIBADD = -lproj
 
-KDTLIBS = -LRStarTree -lcSmRST -Lkdt -lkdt
-KDTDEPS = RStarTree/libcSmRST.la kdt/libkdt.la
-
-libterrain3D_la_SOURCES = terrain.c rsurface.c rsurface.h
-libterrain3D_la_LIBADD = $(KDTLIBS)
-libterrain3D_la_DEPENDENCIES = $(KDTDEPS)
-
-libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
-libterrain2D_la_SOURCES = terrain.c rsurface.c rsurface.h
-libterrain2D_la_LIBADD = $(KDTLIBS)
-libterrain2D_la_DEPENDENCIES = $(KDTDEPS)
-
-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)
+KDTLIBS = -Lkdt -lkdt
+KDTDEPS = kdt/libkdt.la
 
 libstokes3D_la_SOURCES = stokes.c CW263.f
 libstokes3D_la_CFLAGS = $(AM_CFLAGS)
@@ -142,26 +117,6 @@ libode2D_la_SOURCES = ode.c
 libode2D_la_CFLAGS = $(AM_CFLAGS) $(ODE_CFLAGS) -DFTT_2D=1
 libode2D_la_LIBADD = $(ODE_LIBS)
 
-xyz2rsurface_SOURCES = xyz2rsurface.c rsurface.c rsurface.h
-xyz2rsurface_LDADD = $(KDTLIBS)
-xyz2rsurface_CFLAGS = $(AM_CFLAGS)
-xyz2rsurface_DEPENDENCIES = $(KDTDEPS)
-
-rsurfacequery_SOURCES = rsurfacequery.c rsurface.c rsurface.h
-rsurfacequery_LDADD = -LRStarTree -lcSmRST -Lkdt -lkdt
-rsurfacequery_CFLAGS = $(AM_CFLAGS)
-rsurfacequery_DEPENDENCIES = $(KDTDEPS)
-
-rsurfacedraw_SOURCES = rsurfacedraw.c rsurface.c rsurface.h
-rsurfacedraw_LDADD = $(KDTLIBS)
-rsurfacedraw_CFLAGS = $(AM_CFLAGS)
-rsurfacedraw_DEPENDENCIES = $(KDTDEPS)
-
-rsurfaceinfo_SOURCES = rsurfaceinfo.c rsurface.c rsurface.h
-rsurfaceinfo_LDADD = $(KDTLIBS)
-rsurfaceinfo_CFLAGS = $(AM_CFLAGS)
-rsurfaceinfo_DEPENDENCIES = $(KDTDEPS)
-
 libparticulates3D_la_SOURCES = particulates.c particulates.h
 libparticulates3D_la_CFLAGS = $(AM_CFLAGS)
 libparticulates2D_la_SOURCES = particulates.c particulates.h

-- 
Gerris Flow Solver