[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit bbfd32b4fbdabbeb2aa79b04ba2a5618eec64e80
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Apr 10 19:10:52 2008 +1000

    Upgraded/integrated Makefile.am for RStarTree
    
    darcs-hash:20080410091052-d4795-27bdd0c976648c0ed8ac836d564cf4112b1a4b9a.gz

diff --git a/configure.in b/configure.in
index 3452841..0d94b11 100644
--- a/configure.in
+++ b/configure.in
@@ -437,6 +437,7 @@ src/gerris2D3.pc
 src/gerris3D.pc
 tools/Makefile
 modules/Makefile
+modules/RStarTree/Makefile
 test/Makefile
 doc/Makefile
 doc/tutorial/Makefile
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 3a713b6..597e99e 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = RStarTree
+
 INCLUDES = -I$(top_srcdir)/src -I$(includedir) \
            -DG_LOG_DOMAIN=\"Gfs-modules\" $(GTS_CFLAGS)
 
diff --git a/modules/RStarTree/Makefile b/modules/RStarTree/Makefile
deleted file mode 100644
index 14a83f8..0000000
--- a/modules/RStarTree/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-# Make RStarTree C-Version R2.0
-
-# Cflags = -g -ansi -pedantic -Wall
-# Cflags = -g -ansi -pedantic
-Cflags = -O -ansi -pedantic -Wall
-# Cflags = -O -ansi -pedantic
-
-CC = gcc
-
-
-compile = $(CC) $(Cflags) -c
-link = $(CC) $(Cflags) -o
-
-
-RSTos = RStarTree.o RSTInterUtil.o RSTInOut.o RSTInstDel.o RSTUtil.o \
-        RSTQuery.o  RSTJoin.o
-
-
-libraries = libcSmRST.a
-programs = trst
-
-
-  RANLIB = ranlib $(libraries)          # Berkely
-# RANLIB = @ echo 'skipping ranlib'     # SVR4
-
-
-all: $(libraries) $(programs)
-
-
-#
-# Libraries
-#
-libcSmRST.a: $(RSTos)
-	ar rcv libcSmRST.a $(RSTos)
-	$(RANLIB)
-	mv README ..
-	mv libcSmRST.a ..
-	cp RStarTree.h ..
-	cp RSTBase.h ..
-
-#
-# Main Programs
-#
-trst: trst.o \
-      libcSmRST.a \
-      Set.o
-	$(link) trst trst.o Set.o -L.. -lcSmRST
-
-trst.o: trst.c \
-        RStarTree.h \
-        Set.h
-	$(compile) trst.c
-
-#
-# compile the modules.
-#
-RStarTree.o: RStarTree.c \
-             RStarTree.h \
-             RSTInterUtil.h \
-             RSTInOut.h \
-             RSTInstDel.h \
-             RSTQuery.h \
-             RSTJoin.h
-	$(compile) RStarTree.c
-
-RSTInterUtil.o: RSTInterUtil.c \
-                RSTInterUtil.h \
-                RStarTree.h
-	$(compile) RSTInterUtil.c
-
-RSTInOut.o: RSTInOut.c \
-            RSTInOut.h \
-            RStarTree.h
-	$(compile) RSTInOut.c
-
-RSTInstDel.o: RSTInstDel.c \
-              RSTInstDel.h \
-              RStarTree.h \
-              RSTUtil.h \
-              RSTInOut.h
-	$(compile) RSTInstDel.c
-
-RSTUtil.o: RSTUtil.c \
-           RSTUtil.h \
-           RStarTree.h
-	$(compile) RSTUtil.c
-
-RSTQuery.o: RSTQuery.c \
-            RSTQuery.h \
-            RStarTree.h \
-            RSTUtil.h \
-            RSTInOut.h
-	$(compile) RSTQuery.c
-
-RSTJoin.o: RSTJoin.c \
-           RSTJoin.h \
-           RStarTree.h \
-           RSTUtil.h \
-           RSTInOut.h
-	$(compile) RSTJoin.c
-
-Set.o: Set.c \
-       Set.h
-	$(compile) Set.c
-
-#
-# interface dependencies
-#
-RStarTree.h: RSTBase.h
-	touch RStarTree.h
-
-RSTInterUtil.h: RStarTree.h
-	touch RSTInterUtil.h
-
-RSTInOut.h: RStarTree.h
-	touch RSTInOut.h
-
-RSTInstDel.h: RStarTree.h
-	touch RSTInstDel.h
-
-RSTUtil.h: RStarTree.h
-	touch RSTUtil.h
-
-RSTQuery.h: RStarTree.h
-	touch RSTQuery.h
-
-RSTJoin.h: RStarTree.h
-	touch RSTJoin.h
-
-Set.h: SetDef.h
-	touch Set.h
diff --git a/modules/RStarTree/Makefile.am b/modules/RStarTree/Makefile.am
new file mode 100644
index 0000000..c4a5e24
--- /dev/null
+++ b/modules/RStarTree/Makefile.am
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+noinst_LIBRARIES = libcSmRST.a
+
+libcSmRST_a_CFLAGS = $(AM_CFLAGS)
+libcSmRST_a_SOURCES = \
+		RStarTree.c \
+		RStarTree.h \
+		RSTInstDel.c \
+		RSTInstDel.h \
+		RSTJoin.c \
+		RSTJoin.h \
+		RSTUtil.c \
+	        RSTUtil.h \
+		RSTInOut.c \
+		RSTInOut.h \
+	        RSTInterUtil.c \
+	        RSTInterUtil.h  \
+	        RSTQuery.c \
+		RSTQuery.h \
+		RSTBase.h

-- 
Gerris Flow Solver