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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 928a2eb255d47c3e62d1e27c36d019f8ad267544
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Feb 25 11:20:51 2009 +1100

    Fix for incorrect 'dist' dependency in wavewatch module
    
    darcs-hash:20090225002051-d4795-74655ee347209800ba2e581f7186a0d5b4794c3f.gz

diff --git a/modules/wavewatch/Makefile.am b/modules/wavewatch/Makefile.am
index ffb751c..c99747c 100644
--- a/modules/wavewatch/Makefile.am
+++ b/modules/wavewatch/Makefile.am
@@ -3,7 +3,6 @@
 if BUILD_WAVEWATCH
 WAVEWATCH = libwavewatch.a
 CHECKTYPES = checktypes
-BUILT = cfortrantypes.h
 endif
 
 noinst_LIBRARIES = $(WAVEWATCH)
@@ -11,19 +10,19 @@ noinst_PROGRAMS = $(CHECKTYPES)
 
 EXTRA_DIST = gfsad3 gfsw3initmd.ftn wavewatch.h fchecktypes.ftn
 
-BUILT_SOURCES = $(BUILT)
-
 checktypes_SOURCES = cchecktypes.c
 checktypes_LDADD = fchecktypes.o
 
-libwavewatch_a_SOURCES = cfortrantypes.h
+libwavewatch_a_SOURCES =
+
+CLEANFILES = cfortrantypes.h
 
-libwavewatch.a: gfsw3initmd.o $(HOME)/.wwatch3.env
+libwavewatch.a: gfsw3initmd.o
 	rm -f libwavewatch.a
 	$(AR) cru libwavewatch.a `grep WWATCH3_DIR $(HOME)/.wwatch3.env | awk '{print $$2 "/obj/w3*.o"}'` gfsw3initmd.o
 	$(RANLIB) libwavewatch.a
 
-gfsw3initmd.o: gfsw3initmd.ftn $(HOME)/.wwatch3.env gfsad3
+gfsw3initmd.o: gfsw3initmd.ftn $(HOME)/.wwatch3.env gfsad3 cfortrantypes.h
 	sh gfsad3 gfsw3initmd.ftn
 
 fchecktypes.o: fchecktypes.ftn $(HOME)/.wwatch3.env gfsad3

-- 
Gerris Flow Solver