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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 3b050c75b7ec0c2347a31df66aea86c6b580a568
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Jun 12 22:06:05 2008 +1000

    Fix for linking utility libraries with libtool
    
    darcs-hash:20080612120605-d4795-8e07a72e6700b01aedcfea6f15e4549505afe375.gz

diff --git a/modules/RStarTree/Makefile.am b/modules/RStarTree/Makefile.am
index debc941..ebb7d85 100644
--- a/modules/RStarTree/Makefile.am
+++ b/modules/RStarTree/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libcSmRST.a
+noinst_LTLIBRARIES = libcSmRST.la
 
-libcSmRST_a_CFLAGS = $(AM_CFLAGS) -D_FILE_OFFSET_BITS=64
-libcSmRST_a_SOURCES = \
+libcSmRST_la_CFLAGS = $(AM_CFLAGS) -D_FILE_OFFSET_BITS=64
+libcSmRST_la_SOURCES = \
 		RStarTree.c \
 		RStarTree.h \
 		RSTInstDel.c \
diff --git a/modules/fes2004/Makefile.am b/modules/fes2004/Makefile.am
index c2e5cca..9c22935 100644
--- a/modules/fes2004/Makefile.am
+++ b/modules/fes2004/Makefile.am
@@ -1,11 +1,11 @@
 if BUILD_TIDE
-TIDE = libfes.a
+TIDE = libfes.la
 endif
 
-noinst_LIBRARIES = $(TIDE)
+noinst_LTLIBRARIES = $(TIDE)
 
-libfes_a_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
-libfes_a_SOURCES = \
+libfes_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
+libfes_la_SOURCES = \
 	fes2004_alloc.c \
 	fes2004_error.c \
 	fes2004_extraction.c \

-- 
Gerris Flow Solver