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

Stephane Popinet popinet at users.sf.net
Fri May 15 02:56:13 UTC 2009


The following commit has been merged in the upstream branch:
commit 7d4acdaf93b569cd8f8b7270b15e021cc1072bf2
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon Feb 23 20:31:36 2009 +1100

    Fix for wavewatch module makefile
    
    darcs-hash:20090223093136-d4795-2d234c18bd603e148822fd5f83aafd9c575af6cc.gz

diff --git a/modules/wavewatch/Makefile.am b/modules/wavewatch/Makefile.am
index 9660e4f..82b1e21 100644
--- a/modules/wavewatch/Makefile.am
+++ b/modules/wavewatch/Makefile.am
@@ -2,21 +2,23 @@
 
 if BUILD_WAVEWATCH
 WAVEWATCH = libwavewatch.a
+CHECKTYPES = checktypes
+BUILT = cfortrantypes.h
 endif
 
 noinst_LIBRARIES = $(WAVEWATCH)
-noinst_PROGRAMS = checktypes
+noinst_PROGRAMS = $(CHECKTYPES)
 
 EXTRA_DIST = gfsad3 gfsw3initmd.ftn wavewatch.h fchecktypes.ftn
 
-BUILT_SOURCES = cfortrantypes.h
+BUILT_SOURCES = $(BUILT)
 
 checktypes_SOURCES = cchecktypes.c
 checktypes_LDADD = fchecktypes.o
 
 libwavewatch_a_SOURCES = cfortrantypes.h
 
-libwavewatch.a: gfsw3initmd.o cfortrantypes.h
+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

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list