Description: fix FTBFS in makefiles Author: Drew Parsons Index: gerris-snapshot-131206/doc/Makefile.in =================================================================== --- gerris-snapshot-131206.orig/doc/Makefile.in +++ gerris-snapshot-131206/doc/Makefile.in @@ -64,9 +64,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.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -80,8 +85,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 \ @@ -285,6 +290,10 @@ EXTRA_DIST = figures share doxy.conf ger 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: @@ -328,6 +337,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) @@ -335,7 +347,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoclass.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoclass-autoclass.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoclass-init.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -358,6 +371,34 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +autoclass-autoclass.o: autoclass.c +@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 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-autoclass.Tpo $(DEPDIR)/autoclass-autoclass.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='autoclass.c' object='autoclass-autoclass.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-autoclass.Tpo $(DEPDIR)/autoclass-autoclass.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='autoclass.c' object='autoclass-autoclass.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-init.Tpo $(DEPDIR)/autoclass-init.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='autoclass-init.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/autoclass-init.Tpo $(DEPDIR)/autoclass-init.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='autoclass-init.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 @@ -679,10 +720,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 Index: gerris-snapshot-131206/doc/examples/Makefile.in =================================================================== --- gerris-snapshot-131206.orig/doc/examples/Makefile.in +++ gerris-snapshot-131206/doc/examples/Makefile.in @@ -68,12 +68,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/||"`;; \ @@ -605,6 +612,14 @@ EXAMPLES = cylinder rt boussinesq logo c 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 @@ -656,6 +671,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) @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ @@ -698,8 +719,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classes.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modules.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classes-classes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/classes-init.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modules-modules.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -722,6 +744,48 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +classes-classes.o: classes.c +@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 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-classes.Tpo $(DEPDIR)/classes-classes.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='classes.c' object='classes-classes.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-classes.Tpo $(DEPDIR)/classes-classes.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='classes.c' object='classes-classes.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-init.Tpo $(DEPDIR)/classes-init.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='classes-init.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/classes-init.Tpo $(DEPDIR)/classes-init.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/init.c' object='classes-init.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/modules-modules.Tpo $(DEPDIR)/modules-modules.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modules.c' object='modules-modules.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 +@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` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/modules-modules.Tpo $(DEPDIR)/modules-modules.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modules.c' object='modules-modules.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 @@ -1140,7 +1204,7 @@ uninstall-am: uninstall-binSCRIPTS unins 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 @@ -1151,7 +1215,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 @@ -1165,7 +1229,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 @@ -1381,14 +1445,6 @@ examples.tar.gz: examples.pdf examples $ 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