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

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 9e95a64d068809fb9499dc926fafbea2af9dc055
Author: Drew Parsons <dparsons at debian.org>
Date:   Thu Apr 7 10:48:03 2011 +1000

    update patch 01_automake_doc_examples
    
    for building with builddir separate from srcdir
    (used in Debian to build with and without MPI support)

diff --git a/debian/patches/01_automake_doc_examples b/debian/patches/01_automake_doc_examples
index f59a6ae..f489ba1 100644
--- a/debian/patches/01_automake_doc_examples
+++ b/debian/patches/01_automake_doc_examples
@@ -1,38 +1,72 @@
 Index: gerris/doc/examples/Makefile.am
 ===================================================================
---- gerris.orig/doc/examples/Makefile.am	2009-12-28 01:02:17.000000000 +1100
-+++ gerris/doc/examples/Makefile.am	2009-12-28 12:21:03.000000000 +1100
-@@ -40,10 +40,10 @@
- pkgdata_DATA = gfs.lang gerris.dic
+--- gerris.orig/doc/examples/Makefile.am	2011-04-06 16:12:06.000000000 +1000
++++ gerris/doc/examples/Makefile.am	2011-04-07 10:45:21.000000000 +1000
+@@ -50,7 +50,7 @@
+ pkgdata_DATA = gfs.lang gerris.dic gfs-keywords.el gfs-mode.el gfs.sty gfs.hva kaltura.sh gfs.php
  
- gfs.lang: classes
--	$(srcdir)/classes > gfs.lang
-+	$(builddir)/classes > gfs.lang
+ gerris.dic: classes modulesyms.sh $(top_srcdir)/modules/Makefile.am modules.list
+-	($(srcdir)/classes && sh $(srcdir)/modulesyms.sh $(top_srcdir)/modules $(pkglibdir)) | sort > gerris.dic
++	($(builddir)/classes && sh $(srcdir)/modulesyms.sh $(top_srcdir)/modules $(pkglibdir)) | sort > gerris.dic
  
- gerris.dic: classes
--	$(srcdir)/classes | awk '$$1 ~ /gfs_keyword/ {print $$3}' | sed 's/"//g' > gerris.dic
-+	$(builddir)/classes | awk '$$1 ~ /gfs_keyword/ {print $$3}' | sed 's/"//g' > gerris.dic
+ gfs.lang: gerris.dic
+ 	echo "# Language file for source-highlight" > gfs.lang
+@@ -61,7 +61,7 @@
+ 	echo "redef preproc = \"C preprocessor command is not compatible with the use of # as comment character in GTS\"" >> gfs.lang
  
- gfs2doc: gfs2doc.in
+ modules.list: modules $(top_srcdir)/modules/Makefile.am
+-	$(srcdir)/modules $(top_srcdir)/modules/*.la $(pkglibdir)/*.so | sort | uniq > modules.list
++	$(builddir)/modules $(top_srcdir)/modules/*.la $(pkglibdir)/*.so | sort | uniq > modules.list
  
-@@ -87,7 +87,7 @@
- 	sed "s/GFS_VERSION/`$(top_srcdir)/src/gerris2D -V 2>&1 | awk '{ if ($$5 == "version") print $$6}'`/g" < template.tex | sed 's/\\today/'"`date +\"%B %e, %Y\"`/g" > examples.tex
+ gfs-keywords.el: gerris.dic modules.list
+ 	echo "(defvar gfs-abbrevs '(" > gfs-keywords.el
+@@ -75,7 +75,7 @@
+ 	echo "(provide 'gfs-keywords)" >> gfs-keywords.el
  
- Makefile.deps: Makefile depend.py
--	python depend.py $(EXAMPLES) > Makefile.deps
-+	python $(srcdir)/depend.py $(EXAMPLES) > Makefile.deps
+ gfs.php: gerris.dic modules.list gfs.php.sh
+-	sh gfs.php.sh > gfs.php
++	sh $(srcdir)/gfs.php.sh > gfs.php
  
- -include Makefile.deps
+ gfs2doc: gfs2doc.in
  
-@@ -99,6 +99,8 @@
+@@ -134,13 +134,15 @@
  
- noinst_PROGRAMS = classes
+ noinst_PROGRAMS = classes modules
  
 -classes: classes.c $(top_srcdir)/src/init.c
 -	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(INCLUDES) -DFTT_2D=1 \
 -	classes.c -o classes $(GFS2D_LIBS)
+-
+-modules: modules.c
+-	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(INCLUDES) -DFTT_2D=1 \
+-	modules.c -o modules $(GFS2D_LIBS)
 +classes_SOURCES = classes.c $(top_srcdir)/src/init.c
 +classes_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
 +classes_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src
 +classes_LDADD = $(GFS2D_LIBS)
 +
++modules_SOURCES = modules.c
++modules_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
++modules_CPPFLAGS = $(INCLUDES)
++modules_LDADD = $(GFS2D_LIBS)
+ 
+ publish: examples.tar.gz
+ 	cp examples.tar.gz $(WEBROOT)/examples
+Index: gerris/doc/Makefile.am
+===================================================================
+--- gerris.orig/doc/Makefile.am	2011-04-07 10:41:48.000000000 +1000
++++ gerris/doc/Makefile.am	2011-04-07 10:42:09.000000000 +1000
+@@ -11,9 +11,10 @@
+ INCLUDES = -I$(top_srcdir)/src -I$(includedir) -DG_LOG_DOMAIN=\"Gfs-tools\"\
+             $(GTS_CFLAGS)
+ 
+-autoclass: autoclass.c $(top_srcdir)/src/init.c
+-	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(INCLUDES) -DFTT_2D=1 \
+-	autoclass.c -o autoclass $(GFS2D_LIBS)
++autoclass_SOURCES = autoclass.c $(top_srcdir)/src/init.c
++autoclass_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
++autoclass_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src
++autoclass_LDADD = $(GFS2D_LIBS)
+ 
+ reference: Makefile.am autoclass share/autoclass.sh share/doxfilter share/renamemodules doxy.conf
+ 	sh share/autoclass.sh | sort -k2,3 | ./autoclass > hierarchy.c

-- 
Gerris Flow Solver