[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:56:15 UTC 2009
The following commit has been merged in the upstream branch:
commit 404897c9053c355cf74ef30d4e20603de0e2979f
Author: Stephane Popinet <popinet at users.sf.net>
Date: Fri Feb 27 06:45:04 2009 +1100
Fix (again!) for module dependencies
darcs-hash:20090226194504-d4795-f9cc436b7cbe9bac28312a57967b7c481ebadd89.gz
diff --git a/modules/Makefile.am b/modules/Makefile.am
index f96b9d0..d1e67c6 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -63,17 +63,17 @@ libmap2D3_la_LIBADD = -lproj
libterrain3D_la_SOURCES = terrain.c rsurface.c rsurface.h
libterrain3D_la_LIBADD = -LRStarTree -lcSmRST
-libterrain3D_la_DEPENDENCIES = RStarTree/libcSmRST.a
+libterrain3D_la_DEPENDENCIES = RStarTree/libcSmRST.la
libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
libterrain2D_la_SOURCES = terrain.c rsurface.c rsurface.h
libterrain2D_la_LIBADD = -LRStarTree -lcSmRST
-libterrain2D_la_DEPENDENCIES = RStarTree/libcSmRST.a
+libterrain2D_la_DEPENDENCIES = RStarTree/libcSmRST.la
libterrain2D3_la_SOURCES = terrain.c rsurface.c rsurface.h
libterrain2D3_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D3=1
libterrain2D3_la_LIBADD = -LRStarTree -lcSmRST
-libterrain2D3_la_DEPENDENCIES = RStarTree/libcSmRST.a
+libterrain2D3_la_DEPENDENCIES = RStarTree/libcSmRST.la
libtide3D_la_SOURCES = tide.c
libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
@@ -98,17 +98,17 @@ libwavewatch2D_la_DEPENDENCIES = wavewatch/libwavewatch.a
xyz2rsurface_SOURCES = xyz2rsurface.c rsurface.c rsurface.h
xyz2rsurface_LDADD = -LRStarTree -lcSmRST
xyz2rsurface_CFLAGS = $(AM_CFLAGS)
-xyz2rsurface_DEPENDENCIES = RStarTree/libcSmRST.a
+xyz2rsurface_DEPENDENCIES = RStarTree/libcSmRST.la
rsurfacequery_SOURCES = rsurfacequery.c rsurface.c rsurface.h
rsurfacequery_LDADD = -LRStarTree -lcSmRST
rsurfacequery_CFLAGS = $(AM_CFLAGS)
-rsurfacequery_DEPENDENCIES = RStarTree/libcSmRST.a
+rsurfacequery_DEPENDENCIES = RStarTree/libcSmRST.la
rsurfacedraw_SOURCES = rsurfacedraw.c rsurface.c rsurface.h
rsurfacedraw_LDADD = -LRStarTree -lcSmRST
rsurfacedraw_CFLAGS = $(AM_CFLAGS)
-rsurfacedraw_DEPENDENCIES = RStarTree/libcSmRST.a
+rsurfacedraw_DEPENDENCIES = RStarTree/libcSmRST.la
if HAVE_MODULES
%.c : %.mod
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list