[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-20091109-dfsg.1-2-7-g5e03593
Drew Parsons
dparsons at debian.org
Thu Apr 7 01:35:48 UTC 2011
The following commit has been merged in the debian-unstable branch:
commit 5e035939be3be27e1713677e1d28103ea04d0907
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Apr 7 11:00:12 2011 +1000
autoreconf to apply Makefile changes in patch 01_automake_doc_examples
debhelper (dh, dh_auto_configure) does not run autoreconf to use the
patched Makefile.am files, so need to autoreconf manually, as
described in debian/README.source.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d9387b3..3d7c6eb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -49,9 +49,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
-autoclass_SOURCES = autoclass.c
-autoclass_OBJECTS = autoclass.$(OBJEXT)
-autoclass_LDADD = $(LDADD)
+am_autoclass_OBJECTS = autoclass-autoclass.$(OBJEXT) \
+ autoclass-init.$(OBJEXT)
+autoclass_OBJECTS = $(am_autoclass_OBJECTS)
+am__DEPENDENCIES_1 =
+autoclass_DEPENDENCIES = $(am__DEPENDENCIES_1)
+autoclass_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(autoclass_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -65,8 +70,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = autoclass.c
-DIST_SOURCES = autoclass.c
+SOURCES = $(autoclass_SOURCES)
+DIST_SOURCES = $(autoclass_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -266,6 +271,10 @@ EXTRA_DIST = figures share doxy.conf
INCLUDES = -I$(top_srcdir)/src -I$(includedir) -DG_LOG_DOMAIN=\"Gfs-tools\"\
$(GTS_CFLAGS)
+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)
all: all-recursive
.SUFFIXES:
@@ -309,6 +318,9 @@ clean-noinstPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+autoclass$(EXEEXT): $(autoclass_OBJECTS) $(autoclass_DEPENDENCIES)
+ @rm -f autoclass$(EXEEXT)
+ $(autoclass_LINK) $(autoclass_OBJECTS) $(autoclass_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -316,7 +328,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/autoclass.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/autoclass-autoclass.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/autoclass-init.Po at am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -339,6 +352,34 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+autoclass-autoclass.o: autoclass.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -MT autoclass-autoclass.o -MD -MP -MF $(DEPDIR)/autoclass-autoclass.Tpo -c -o autoclass-autoclass.o `test -f 'autoclass.c' || echo '$(srcdir)/'`autoclass.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-autoclass.Tpo $(DEPDIR)/autoclass-autoclass.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='autoclass.c' object='autoclass-autoclass.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -c -o autoclass-autoclass.o `test -f 'autoclass.c' || echo '$(srcdir)/'`autoclass.c
+
+autoclass-autoclass.obj: autoclass.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -MT autoclass-autoclass.obj -MD -MP -MF $(DEPDIR)/autoclass-autoclass.Tpo -c -o autoclass-autoclass.obj `if test -f 'autoclass.c'; then $(CYGPATH_W) 'autoclass.c'; else $(CYGPATH_W) '$(srcdir)/autoclass.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-autoclass.Tpo $(DEPDIR)/autoclass-autoclass.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='autoclass.c' object='autoclass-autoclass.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -c -o autoclass-autoclass.obj `if test -f 'autoclass.c'; then $(CYGPATH_W) 'autoclass.c'; else $(CYGPATH_W) '$(srcdir)/autoclass.c'; fi`
+
+autoclass-init.o: $(top_srcdir)/src/init.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -MT autoclass-init.o -MD -MP -MF $(DEPDIR)/autoclass-init.Tpo -c -o autoclass-init.o `test -f '$(top_srcdir)/src/init.c' || echo '$(srcdir)/'`$(top_srcdir)/src/init.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-init.Tpo $(DEPDIR)/autoclass-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='autoclass-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -c -o autoclass-init.o `test -f '$(top_srcdir)/src/init.c' || echo '$(srcdir)/'`$(top_srcdir)/src/init.c
+
+autoclass-init.obj: $(top_srcdir)/src/init.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -MT autoclass-init.obj -MD -MP -MF $(DEPDIR)/autoclass-init.Tpo -c -o autoclass-init.obj `if test -f '$(top_srcdir)/src/init.c'; then $(CYGPATH_W) '$(top_srcdir)/src/init.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/init.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-init.Tpo $(DEPDIR)/autoclass-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='autoclass-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autoclass_CPPFLAGS) $(CPPFLAGS) $(autoclass_CFLAGS) $(CFLAGS) -c -o autoclass-init.obj `if test -f '$(top_srcdir)/src/init.c'; then $(CYGPATH_W) '$(top_srcdir)/src/init.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/init.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -658,10 +699,6 @@ uninstall-am:
uninstall uninstall-am
-autoclass: autoclass.c $(top_srcdir)/src/init.c
- $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(INCLUDES) -DFTT_2D=1 \
- autoclass.c -o autoclass $(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
@chmod +x share/doxfilter
diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
index 6bca784..e7301c6 100644
--- a/doc/examples/Makefile.in
+++ b/doc/examples/Makefile.in
@@ -53,12 +53,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gfs2doc gfs-highlight crossref.sh
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
-classes_SOURCES = classes.c
-classes_OBJECTS = classes.$(OBJEXT)
-classes_LDADD = $(LDADD)
-modules_SOURCES = modules.c
-modules_OBJECTS = modules.$(OBJEXT)
-modules_LDADD = $(LDADD)
+am_classes_OBJECTS = classes-classes.$(OBJEXT) classes-init.$(OBJEXT)
+classes_OBJECTS = $(am_classes_OBJECTS)
+am__DEPENDENCIES_1 =
+classes_DEPENDENCIES = $(am__DEPENDENCIES_1)
+classes_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(classes_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am_modules_OBJECTS = modules-modules.$(OBJEXT)
+modules_OBJECTS = $(am_modules_OBJECTS)
+modules_DEPENDENCIES = $(am__DEPENDENCIES_1)
+modules_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(modules_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -96,8 +103,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = classes.c modules.c
-DIST_SOURCES = classes.c modules.c
+SOURCES = $(classes_SOURCES) $(modules_SOURCES)
+DIST_SOURCES = $(classes_SOURCES) $(modules_SOURCES)
DATA = $(pkgdata_DATA) $(pkglib_DATA)
ETAGS = etags
CTAGS = ctags
@@ -519,6 +526,14 @@ TESTS = \
INCLUDES = -I$(top_srcdir)/src -I$(includedir) -DG_LOG_DOMAIN=\"Gfs-tools\"\
$(GTS_CFLAGS)
+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)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -569,6 +584,12 @@ clean-noinstPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+classes$(EXEEXT): $(classes_OBJECTS) $(classes_DEPENDENCIES)
+ @rm -f classes$(EXEEXT)
+ $(classes_LINK) $(classes_OBJECTS) $(classes_LDADD) $(LIBS)
+modules$(EXEEXT): $(modules_OBJECTS) $(modules_DEPENDENCIES)
+ @rm -f modules$(EXEEXT)
+ $(modules_LINK) $(modules_OBJECTS) $(modules_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -610,8 +631,9 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/classes.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/modules.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/classes-classes.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/classes-init.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/modules-modules.Po at am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -634,6 +656,48 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+classes-classes.o: classes.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -MT classes-classes.o -MD -MP -MF $(DEPDIR)/classes-classes.Tpo -c -o classes-classes.o `test -f 'classes.c' || echo '$(srcdir)/'`classes.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-classes.Tpo $(DEPDIR)/classes-classes.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='classes.c' object='classes-classes.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -c -o classes-classes.o `test -f 'classes.c' || echo '$(srcdir)/'`classes.c
+
+classes-classes.obj: classes.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -MT classes-classes.obj -MD -MP -MF $(DEPDIR)/classes-classes.Tpo -c -o classes-classes.obj `if test -f 'classes.c'; then $(CYGPATH_W) 'classes.c'; else $(CYGPATH_W) '$(srcdir)/classes.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-classes.Tpo $(DEPDIR)/classes-classes.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='classes.c' object='classes-classes.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -c -o classes-classes.obj `if test -f 'classes.c'; then $(CYGPATH_W) 'classes.c'; else $(CYGPATH_W) '$(srcdir)/classes.c'; fi`
+
+classes-init.o: $(top_srcdir)/src/init.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -MT classes-init.o -MD -MP -MF $(DEPDIR)/classes-init.Tpo -c -o classes-init.o `test -f '$(top_srcdir)/src/init.c' || echo '$(srcdir)/'`$(top_srcdir)/src/init.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-init.Tpo $(DEPDIR)/classes-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='classes-init.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -c -o classes-init.o `test -f '$(top_srcdir)/src/init.c' || echo '$(srcdir)/'`$(top_srcdir)/src/init.c
+
+classes-init.obj: $(top_srcdir)/src/init.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -MT classes-init.obj -MD -MP -MF $(DEPDIR)/classes-init.Tpo -c -o classes-init.obj `if test -f '$(top_srcdir)/src/init.c'; then $(CYGPATH_W) '$(top_srcdir)/src/init.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/init.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-init.Tpo $(DEPDIR)/classes-init.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='classes-init.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(classes_CPPFLAGS) $(CPPFLAGS) $(classes_CFLAGS) $(CFLAGS) -c -o classes-init.obj `if test -f '$(top_srcdir)/src/init.c'; then $(CYGPATH_W) '$(top_srcdir)/src/init.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/init.c'; fi`
+
+modules-modules.o: modules.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(modules_CPPFLAGS) $(CPPFLAGS) $(modules_CFLAGS) $(CFLAGS) -MT modules-modules.o -MD -MP -MF $(DEPDIR)/modules-modules.Tpo -c -o modules-modules.o `test -f 'modules.c' || echo '$(srcdir)/'`modules.c
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/modules-modules.Tpo $(DEPDIR)/modules-modules.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modules.c' object='modules-modules.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(modules_CPPFLAGS) $(CPPFLAGS) $(modules_CFLAGS) $(CFLAGS) -c -o modules-modules.o `test -f 'modules.c' || echo '$(srcdir)/'`modules.c
+
+modules-modules.obj: modules.c
+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(modules_CPPFLAGS) $(CPPFLAGS) $(modules_CFLAGS) $(CFLAGS) -MT modules-modules.obj -MD -MP -MF $(DEPDIR)/modules-modules.Tpo -c -o modules-modules.obj `if test -f 'modules.c'; then $(CYGPATH_W) 'modules.c'; else $(CYGPATH_W) '$(srcdir)/modules.c'; fi`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/modules-modules.Tpo $(DEPDIR)/modules-modules.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modules.c' object='modules-modules.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(modules_CPPFLAGS) $(CPPFLAGS) $(modules_CFLAGS) $(CFLAGS) -c -o modules-modules.obj `if test -f 'modules.c'; then $(CYGPATH_W) 'modules.c'; else $(CYGPATH_W) '$(srcdir)/modules.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -1085,7 +1149,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataDATA \
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
gfs.lang: gerris.dic
echo "# Language file for source-highlight" > gfs.lang
@@ -1096,7 +1160,7 @@ gfs.lang: gerris.dic
echo "redef preproc = \"C preprocessor command is not compatible with the use of # as comment character in GTS\"" >> gfs.lang
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
gfs-keywords.el: gerris.dic modules.list
echo "(defvar gfs-abbrevs '(" > gfs-keywords.el
@@ -1110,7 +1174,7 @@ gfs-keywords.el: gerris.dic modules.list
echo "(provide 'gfs-keywords)" >> gfs-keywords.el
gfs.php: gerris.dic modules.list gfs.php.sh
- sh gfs.php.sh > gfs.php
+ sh $(srcdir)/gfs.php.sh > gfs.php
gfs2doc: gfs2doc.in
@@ -1303,14 +1367,6 @@ examples.tar.gz: examples.pdf examples $(DOCS)
tar czf examples.tar.gz examples $(DOCS)
rm -r -f examples
-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)
-
publish: examples.tar.gz
cp examples.tar.gz $(WEBROOT)/examples
cd $(WEBROOT)/examples && tar xzf examples.tar.gz && rm -f examples.tar.gz
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list