Attachment #694593 for bug #778341

View | Details | Raw Unified | Return to bug 778341
Collapse All | Expand All




libmap2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
libmap2D_la_LIBADD = $(GFS2D_LIBS) -lproj

KDTLIBS = kdt/libkdt.la -lm
KDTDEPS = kdt/libkdt.la

libterrain3D_la_SOURCES = terrain.c
libterrain3D_la_LIBADD = $(GFS3D_LIBS) $(KDTLIBS)
libterrain3D_la_DEPENDENCIES = $(KDTDEPS)

libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
libterrain2D_la_SOURCES = terrain.c
libterrain2D_la_LIBADD = $(GFS2D_LIBS) $(KDTLIBS)
libterrain2D_la_DEPENDENCIES = $(KDTDEPS)

libtide3D_la_SOURCES = tide.c
libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
libtide3D_la_LIBADD = $(GFS3D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
libtide2D_la_SOURCES = tide.c
libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1
libtide2D_la_LIBADD = $(GFS2D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)

libstokes3D_la_SOURCES = stokes.c CW263.f
libstokes3D_la_CFLAGS = $(AM_CFLAGS)

libstokes2D_la_LIBADD = $(GFS2D_LIBS)

libwavewatch2D_la_SOURCES = wavewatch.c
libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) wavewatch/libwavewatch.la
libwavewatch2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 \
  -DW3SRCE=`nm wavewatch/libwavewatch.a | grep w3srce | awk '{ if ($$2 == "T") print $$3; }'` \
  -DGFSW3INIT=`nm wavewatch/libwavewatch.a | grep gfsw3_init | awk '{ if ($$2 == "T") print $$3; }'`

libode2D_la_LIBADD = $(GFS2D_LIBS) $(ODE_LIBS)

rsurface2kdt_SOURCES = rsurface2kdt.c rsurface.c rsurface.h
rsurface2kdt_LDFLAGS = $(NO_UNDEFINED)
rsurface2kdt_LDADD = RStarTree/libcSmRST.la $(KDTLIBS)
rsurface2kdt_CFLAGS = $(AM_CFLAGS)
rsurface2kdt_DEPENDENCIES = $(KDTDEPS)

noinst_LTLIBRARIES = libparticulatecommon2D.la libparticulatecommon3D.la



libculvert2D_la_SOURCES = culvert.c
libculvert2D_la_CFLAGS = $(AM_CFLAGS)
libculvert2D_la_LIBADD = $(GFS2D_LIBS) culvert/libboyd87.la -lm
libculvert2D_la_DEPENDENCIES = culvert/libboyd87.la

liblayered2D_la_SOURCES = layered.c




noinst_PROGRAMS = check_inlet check_outlet discharge_table

check_outlet_SOURCES = check_outlet.c boyd87.h
check_outlet_LDADD = libboyd87.la -lm
check_outlet_CFLAGS = $(AM_CFLAGS)
check_outlet_DEPENDENCIES = libboyd87.la

check_inlet_SOURCES = check_inlet.c boyd87.h
check_inlet_LDADD = libboyd87.la -lm
check_inlet_CFLAGS = $(AM_CFLAGS)
check_inlet_DEPENDENCIES = libboyd87.la

discharge_table_SOURCES = discharge_table.c boyd87.h
discharge_table_LDADD = libboyd87.la -lm
discharge_table_CFLAGS = $(AM_CFLAGS)
discharge_table_DEPENDENCIES = libboyd87.la





	kdt.h

xyz2kdt_SOURCES = xyz2kdt.c kdt.h
xyz2kdt_LDADD = libkdt.la -lm
xyz2kdt_CFLAGS = $(AM_CFLAGS)
xyz2kdt_DEPENDENCIES = libkdt.la

kdt2kdt_SOURCES = kdt2kdt.c kdt.h
kdt2kdt_LDADD = libkdt.la -lm
kdt2kdt_CFLAGS = $(AM_CFLAGS)
kdt2kdt_DEPENDENCIES = libkdt.la

kdtquery_SOURCES = kdtquery.c kdt.h
kdtquery_LDADD = libkdt.la -lm
kdtquery_CFLAGS = $(AM_CFLAGS)
kdtquery_DEPENDENCIES = libkdt.la

Return to bug 778341

Lines 8-24 libboyd87_la_SOURCES = boyd87.c boyd87.h Link Here

(-)a/modules/culvert/Makefile.am (-3 / +3 lines)
8	noinst_PROGRAMS = check_inlet check_outlet discharge_table	8	noinst_PROGRAMS = check_inlet check_outlet discharge_table
9		9
10	check_outlet_SOURCES = check_outlet.c boyd87.h	10	check_outlet_SOURCES = check_outlet.c boyd87.h
11	check_outlet_LDADD = -lboyd87 -lm	11	check_outlet_LDADD = libboyd87.la -lm
12	check_outlet_CFLAGS = $(AM_CFLAGS)	12	check_outlet_CFLAGS = $(AM_CFLAGS)
13	check_outlet_DEPENDENCIES = libboyd87.la	13	check_outlet_DEPENDENCIES = libboyd87.la
14		14
15	check_inlet_SOURCES = check_inlet.c boyd87.h	15	check_inlet_SOURCES = check_inlet.c boyd87.h
16	check_inlet_LDADD = -lboyd87 -lm	16	check_inlet_LDADD = libboyd87.la -lm
17	check_inlet_CFLAGS = $(AM_CFLAGS)	17	check_inlet_CFLAGS = $(AM_CFLAGS)
18	check_inlet_DEPENDENCIES = libboyd87.la	18	check_inlet_DEPENDENCIES = libboyd87.la
19		19
20	discharge_table_SOURCES = discharge_table.c boyd87.h	20	discharge_table_SOURCES = discharge_table.c boyd87.h
21	discharge_table_LDADD = -lboyd87 -lm	21	discharge_table_LDADD = libboyd87.la -lm
22	discharge_table_CFLAGS = $(AM_CFLAGS)	22	discharge_table_CFLAGS = $(AM_CFLAGS)
23	discharge_table_DEPENDENCIES = libboyd87.la	23	discharge_table_DEPENDENCIES = libboyd87.la
24		24

Lines 13-28 libkdt_la_SOURCES = \ Link Here

(-)a/modules/kdt/Makefile.am (-3 / +3 lines)
13	kdt.h	13	kdt.h
14		14
15	xyz2kdt_SOURCES = xyz2kdt.c kdt.h	15	xyz2kdt_SOURCES = xyz2kdt.c kdt.h
16	xyz2kdt_LDADD = -lkdt -lm	16	xyz2kdt_LDADD = libkdt.la -lm
17	xyz2kdt_CFLAGS = $(AM_CFLAGS)	17	xyz2kdt_CFLAGS = $(AM_CFLAGS)
18	xyz2kdt_DEPENDENCIES = libkdt.la	18	xyz2kdt_DEPENDENCIES = libkdt.la
19		19
20	kdt2kdt_SOURCES = kdt2kdt.c kdt.h	20	kdt2kdt_SOURCES = kdt2kdt.c kdt.h
21	kdt2kdt_LDADD = -lkdt -lm	21	kdt2kdt_LDADD = libkdt.la -lm
22	kdt2kdt_CFLAGS = $(AM_CFLAGS)	22	kdt2kdt_CFLAGS = $(AM_CFLAGS)
23	kdt2kdt_DEPENDENCIES = libkdt.la	23	kdt2kdt_DEPENDENCIES = libkdt.la
24		24
25	kdtquery_SOURCES = kdtquery.c kdt.h	25	kdtquery_SOURCES = kdtquery.c kdt.h
26	kdtquery_LDADD = -lkdt -lm	26	kdtquery_LDADD = libkdt.la -lm
27	kdtquery_CFLAGS = $(AM_CFLAGS)	27	kdtquery_CFLAGS = $(AM_CFLAGS)
28	kdtquery_DEPENDENCIES = libkdt.la	28	kdtquery_DEPENDENCIES = libkdt.la

Lines 78-101 libmap2D_la_SOURCES = map.c Link Here

(-)a/modules/Makefile.am (-10 / +7 lines)
78	libmap2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1	78	libmap2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
79	libmap2D_la_LIBADD = $(GFS2D_LIBS) -lproj	79	libmap2D_la_LIBADD = $(GFS2D_LIBS) -lproj
80		80
81	KDTLIBS = -Lkdt -lkdt -lm	81	KDTLIBS = kdt/libkdt.la -lm
82	KDTDEPS = kdt/libkdt.la
83		82
84	libterrain3D_la_SOURCES = terrain.c	83	libterrain3D_la_SOURCES = terrain.c
85	libterrain3D_la_LIBADD = $(GFS3D_LIBS) $(KDTLIBS)	84	libterrain3D_la_LIBADD = $(GFS3D_LIBS) $(KDTLIBS)
86	libterrain3D_la_DEPENDENCIES = $(KDTDEPS)
87		85
88	libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1	86	libterrain2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
89	libterrain2D_la_SOURCES = terrain.c	87	libterrain2D_la_SOURCES = terrain.c
90	libterrain2D_la_LIBADD = $(GFS2D_LIBS) $(KDTLIBS)	88	libterrain2D_la_LIBADD = $(GFS2D_LIBS) $(KDTLIBS)
91	libterrain2D_la_DEPENDENCIES = $(KDTDEPS)
92		89
93	libtide3D_la_SOURCES = tide.c	90	libtide3D_la_SOURCES = tide.c
94	libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)	91	libtide3D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS)
95	libtide3D_la_LIBADD = $(GFS3D_LIBS) -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)	92	libtide3D_la_LIBADD = $(GFS3D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
96	libtide2D_la_SOURCES = tide.c	93	libtide2D_la_SOURCES = tide.c
97	libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1	94	libtide2D_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) -DFTT_2D=1
98	libtide2D_la_LIBADD = $(GFS2D_LIBS) -Lfes2004 -lfes -lnetcdf $(GSL_LIBS)	95	libtide2D_la_LIBADD = $(GFS2D_LIBS) fes2004/libfes.la -lnetcdf $(GSL_LIBS)
99		96
100	libstokes3D_la_SOURCES = stokes.c CW263.f	97	libstokes3D_la_SOURCES = stokes.c CW263.f
101	libstokes3D_la_CFLAGS = $(AM_CFLAGS)	98	libstokes3D_la_CFLAGS = $(AM_CFLAGS)
Lines 105-111 libstokes2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 Link Here
105	libstokes2D_la_LIBADD = $(GFS2D_LIBS)	102	libstokes2D_la_LIBADD = $(GFS2D_LIBS)
106		103
107	libwavewatch2D_la_SOURCES = wavewatch.c	104	libwavewatch2D_la_SOURCES = wavewatch.c
108	libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) -Lwavewatch -lwavewatch	105	libwavewatch2D_la_LIBADD = $(GFS2D_LIBS) wavewatch/libwavewatch.la
109	libwavewatch2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 \	106	libwavewatch2D_la_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1 \
110	-DW3SRCE=`nm wavewatch/libwavewatch.a \| grep w3srce \| awk '{ if ($$2 == "T") print $$3; }'` \	107	-DW3SRCE=`nm wavewatch/libwavewatch.a \| grep w3srce \| awk '{ if ($$2 == "T") print $$3; }'` \
111	-DGFSW3INIT=`nm wavewatch/libwavewatch.a \| grep gfsw3_init \| awk '{ if ($$2 == "T") print $$3; }'`	108	-DGFSW3INIT=`nm wavewatch/libwavewatch.a \| grep gfsw3_init \| awk '{ if ($$2 == "T") print $$3; }'`
Lines 119-127 libode2D_la_CFLAGS = $(AM_CFLAGS) $(ODE_CFLAGS) -DFTT_2D=1 Link Here
119	libode2D_la_LIBADD = $(GFS2D_LIBS) $(ODE_LIBS)	116	libode2D_la_LIBADD = $(GFS2D_LIBS) $(ODE_LIBS)
120		117
121	rsurface2kdt_SOURCES = rsurface2kdt.c rsurface.c rsurface.h	118	rsurface2kdt_SOURCES = rsurface2kdt.c rsurface.c rsurface.h
122	rsurface2kdt_LDADD = -LRStarTree -lcSmRST $(KDTLIBS)	119	rsurface2kdt_LDFLAGS = $(NO_UNDEFINED)
		120	rsurface2kdt_LDADD = RStarTree/libcSmRST.la $(KDTLIBS)
123	rsurface2kdt_CFLAGS = $(AM_CFLAGS)	121	rsurface2kdt_CFLAGS = $(AM_CFLAGS)
124	rsurface2kdt_DEPENDENCIES = $(KDTDEPS)
125		122
126	noinst_LTLIBRARIES = libparticulatecommon2D.la libparticulatecommon3D.la	123	noinst_LTLIBRARIES = libparticulatecommon2D.la libparticulatecommon3D.la
127		124
Lines 210-216 libtopics2D_la_LIBADD = $(GFS2D_LIBS) Link Here
210		207
211	libculvert2D_la_SOURCES = culvert.c	208	libculvert2D_la_SOURCES = culvert.c
212	libculvert2D_la_CFLAGS = $(AM_CFLAGS)	209	libculvert2D_la_CFLAGS = $(AM_CFLAGS)
213	libculvert2D_la_LIBADD = $(GFS2D_LIBS) -Lculvert -lboyd87 -lm	210	libculvert2D_la_LIBADD = $(GFS2D_LIBS) culvert/libboyd87.la -lm
214	libculvert2D_la_DEPENDENCIES = culvert/libboyd87.la	211	libculvert2D_la_DEPENDENCIES = culvert/libboyd87.la
215		212
216	liblayered2D_la_SOURCES = layered.c	213	liblayered2D_la_SOURCES = layered.c