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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 9185318ba119d373343a7cf212821c34b94e0a58
Author: Stephane Popinet <popinet at users.sourceforge.net>
Date:   Thu Nov 4 08:27:31 2004 +1100

    Added targets libdx2D3 and gerris2D3.pc (gerris--mainline--0.7--patch-27)
    
    gerris--mainline--0.7--patch-27
    Keywords:
    
    darcs-hash:20041103212731-aabb8-27b87e8d814ea31c7379e283ad03bafa1f122b1b.gz

diff --git a/configure.in b/configure.in
index a67ac5f..dba51e7 100644
--- a/configure.in
+++ b/configure.in
@@ -394,8 +394,10 @@ Makefile
 src/Makefile
 src/gfs-config
 src/gerris2D.pc
+src/gerris2D3.pc
 src/gerris3D.pc
 src/dx2D.mdf
+src/dx2D3.mdf
 src/dx3D.mdf
 tools/Makefile
 test/Makefile
diff --git a/src/.arch-inventory b/src/.arch-inventory
index 5ca8169..d98428e 100644
--- a/src/.arch-inventory
+++ b/src/.arch-inventory
@@ -1,10 +1,13 @@
 precious ^dx2D\.c$
 precious ^dx2D\.mdf$
+precious ^dx2D3\.c$
+precious ^dx2D3\.mdf$
 precious ^dx3D\.c$
 precious ^dx3D\.mdf$
 precious ^gerris2D$
 precious ^gerris2D\.pc$
 precious ^gerris2D3$
+precious ^gerris2D3\.pc$
 precious ^gerris2D_dir$
 precious ^gerris3D$
 precious ^gerris3D\.pc$
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c3bb31..0437276 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,21 +7,24 @@ bin_SCRIPTS=gfs-config
 
 gfs-config: gfs-config.in
 gerris2D.pc: gerris2D.pc.in
+gerris2D3.pc: gerris2D3.pc.in
 gerris3D.pc: gerris3D.pc.in
 dx2D.mdf: dx2D.mdf.in
+dx2D3.mdf: dx2D3.mdf.in
 dx3D.mdf: dx3D.mdf.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gerris2D.pc gerris3D.pc
+pkgconfig_DATA = gerris2D.pc gerris3D.pc gerris2D3.pc
 
 lib_LTLIBRARIES = libgfs2D.la libgfs3D.la libgfs2D3.la
 
 if HAVE_DX
-DX_MODS = libdx2D.la libdx3D.la 
-DX_MDF = dx2D.mdf dx3D.mdf
+DX_MODS = libdx2D.la libdx3D.la libdx2D3.la
+DX_MDF = dx2D.mdf dx3D.mdf dx2D3.mdf
 DX_2DSRC = dx.c dx2D.c
+DX_2D3SRC = dx.c dx2D3.c
 DX_3DSRC = dx.c dx3D.c
-DX_BUILT_SRC = dx2D.c dx3D.c
+DX_BUILT_SRC = dx2D.c dx3D.c dx2D3.c
 MDF2C = $(DX_PATH)/bin/mdf2c
 else
 DX_MODS = 
@@ -35,8 +38,10 @@ endif
 BUILT_SOURCES= \
 	gfs-config  \
 	gerris2D.pc \
+	gerris2D3.pc \
 	gerris3D.pc \
 	dx2D.mdf    \
+	dx2D3.mdf   \
 	dx3D.mdf    \
 	$(DX_BUILT_SRC)
 
@@ -166,3 +171,9 @@ libdx2D_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
 libdx2D_la_SOURCES = $(DX_2DSRC)
 libdx2D_la_CFLAGS = $(AM_CFLAGS) $(DX_CFLAGS) -DFTT_2D=1
 libdx2D_la_LIBADD = $(GFS2D_LIBS)
+
+libdx2D3_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)\
+	-release $(LT_RELEASE)
+libdx2D3_la_SOURCES = $(DX_2D3SRC)
+libdx2D3_la_CFLAGS = $(AM_CFLAGS) $(DX_CFLAGS) -DFTT_2D3=1
+libdx2D3_la_LIBADD = $(GFS2D3_LIBS)
diff --git a/src/dx2D.mdf.in b/src/dx2D3.mdf.in
similarity index 53%
copy from src/dx2D.mdf.in
copy to src/dx2D3.mdf.in
index e1ff4d7..ccced3e 100644
--- a/src/dx2D.mdf.in
+++ b/src/dx2D3.mdf.in
@@ -1,6 +1,6 @@
 MODULE ImportGfs2D
 CATEGORY Import and Export 
-DESCRIPTION Imports a Gerris Flow Solver 2D simulation file
-LOADABLE "@prefix@/lib/gerris/libdx2D.so"
+DESCRIPTION Imports a Gerris Flow Solver 2D3 simulation file
+LOADABLE "@prefix@/lib/gerris/libdx2D3.so"
 INPUT name; string; (none); file name
 OUTPUT result; group; imported group
diff --git a/src/gerris2D3.pc.in b/src/gerris2D3.pc.in
new file mode 100644
index 0000000..dfdeadf
--- /dev/null
+++ b/src/gerris2D3.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Gerris2D3
+Description: Gerris Flow Solver Library (2D3)
+Version: @VERSION@
+Libs: -L${libdir} -lgfs2D3 -lgts -lm
+Cflags: -I${includedir} -DFTT_2D3=1

-- 
Gerris Flow Solver