]>
Commit | Line | Data |
---|---|---|
0522bc0d JB |
1 | --- HDF4.2r0/hdf/src/Makefile.am.orig 2003-11-07 00:04:16.000000000 +0100 |
2 | +++ HDF4.2r0/hdf/src/Makefile.am 2004-03-06 12:58:01.866686960 +0100 | |
3 | @@ -2,7 +2,7 @@ | |
4 | ## Library to build ## | |
5 | ############################################################################# | |
6 | ||
7 | -lib_LIBRARIES = libdf.a | |
8 | +lib_LTLIBRARIES = libdf.la | |
9 | ||
10 | FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \ | |
11 | dfr8ff.f dfsdf.c dfsdff.f dfufp2if.f dfutilf.c herrf.c hfilef.c \ | |
12 | @@ -26,10 +26,10 @@ | |
13 | FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc | |
14 | ||
15 | if HDF_BUILD_FORTRAN | |
16 | -libdf_a_SOURCES = $(CSOURCES) $(FSOURCES) | |
17 | +libdf_la_SOURCES = $(CSOURCES) $(FSOURCES) | |
18 | include_HEADERS = $(CHEADERS) $(FHEADERS) | |
19 | else | |
20 | -libdf_a_SOURCES = $(CSOURCES) | |
21 | +libdf_la_SOURCES = $(CSOURCES) | |
22 | include_HEADERS = $(CHEADERS) | |
23 | endif | |
24 | ||
2f1bfa95 JB |
25 | --- HDF4.2r1/hdf/test/Makefile.am.orig 2005-02-14 01:08:13.000000000 +0100 |
26 | +++ HDF4.2r1/hdf/test/Makefile.am 2005-02-27 21:25:42.690871528 +0100 | |
0522bc0d JB |
27 | @@ -21,20 +21,20 @@ |
28 | mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \ | |
2f1bfa95 JB |
29 | tdupimgs.c testhdf.c tree.c tszip.c tvattr.c tvset.c \ |
30 | tvsfpack.c vers.c | |
0522bc0d JB |
31 | -testhdf_LDADD = ../src/libdf.a |
32 | -testhdf_DEPENDENCIES = testdir ../src/libdf.a | |
33 | +testhdf_LDADD = ../src/libdf.la | |
34 | +testhdf_DEPENDENCIES = testdir ../src/libdf.la | |
35 | ||
36 | if HDF_BUILD_FORTRAN | |
37 | fortest_SOURCES = fortest.c | |
38 | -fortest_LDADD = ../src/libdf.a | |
39 | -fortest_DEPENDENCIES = testdir fortestF ../src/libdf.a | |
40 | +fortest_LDADD = ../src/libdf.la | |
41 | +fortest_DEPENDENCIES = testdir fortestF ../src/libdf.la | |
42 | ||
43 | fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f \ | |
44 | t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f \ | |
45 | tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \ | |
46 | tvattrf.f tvsetf.f | |
47 | -fortestF_LDADD = ../src/libdf.a | |
48 | -fortestF_DEPENDENCIES = testdir ../src/libdf.a | |
49 | +fortestF_LDADD = ../src/libdf.la | |
50 | +fortestF_DEPENDENCIES = testdir ../src/libdf.la | |
51 | endif | |
52 | ||
53 | testdir: | |
54 | --- HDF4.2r0/hdf/util/Makefile.am.orig 2003-11-07 19:38:46.000000000 +0100 | |
55 | +++ HDF4.2r0/hdf/util/Makefile.am 2004-03-06 13:04:38.110448752 +0100 | |
56 | @@ -20,76 +20,76 @@ | |
57 | endif | |
58 | ||
59 | gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c | |
60 | -gif2hdf_LDADD = ../src/libdf.a | |
61 | -gif2hdf_DEPENDENCIES = ../src/libdf.a | |
62 | +gif2hdf_LDADD = ../src/libdf.la | |
63 | +gif2hdf_DEPENDENCIES = ../src/libdf.la | |
64 | ||
65 | hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c | |
66 | -hdf2gif_LDADD = ../src/libdf.a | |
67 | -hdf2gif_DEPENDENCIES = ../src/libdf.a | |
68 | +hdf2gif_LDADD = ../src/libdf.la | |
69 | +hdf2gif_DEPENDENCIES = ../src/libdf.la | |
70 | ||
71 | hdf2jpeg_SOURCES = hdf2jpeg.c | |
72 | -hdf2jpeg_LDADD = ../src/libdf.a | |
73 | -hdf2jpeg_DEPENDENCIES = ../src/libdf.a | |
74 | +hdf2jpeg_LDADD = ../src/libdf.la | |
75 | +hdf2jpeg_DEPENDENCIES = ../src/libdf.la | |
76 | ||
77 | hdf24to8_SOURCES = hdf24to8.c | |
78 | -hdf24to8_LDADD = ../src/libdf.a | |
79 | -hdf24to8_DEPENDENCIES = ../src/libdf.a | |
80 | +hdf24to8_LDADD = ../src/libdf.la | |
81 | +hdf24to8_DEPENDENCIES = ../src/libdf.la | |
82 | ||
83 | hdf8to24_SOURCES = hdf8to24.c | |
84 | -hdf8to24_LDADD = ../src/libdf.a | |
85 | -hdf8to24_DEPENDENCIES = ../src/libdf.a | |
86 | +hdf8to24_LDADD = ../src/libdf.la | |
87 | +hdf8to24_DEPENDENCIES = ../src/libdf.la | |
88 | ||
89 | hdfcomp_SOURCES = hdfcomp.c | |
90 | -hdfcomp_LDADD = ../src/libdf.a | |
91 | -hdfcomp_DEPENDENCIES = ../src/libdf.a | |
92 | +hdfcomp_LDADD = ../src/libdf.la | |
93 | +hdfcomp_DEPENDENCIES = ../src/libdf.la | |
94 | ||
95 | hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c | |
96 | -hdfed_LDADD = ../src/libdf.a | |
97 | -hdfed_DEPENDENCIES = ../src/libdf.a | |
98 | +hdfed_LDADD = ../src/libdf.la | |
99 | +hdfed_DEPENDENCIES = ../src/libdf.la | |
100 | ||
101 | hdfls_SOURCES = hdfls.c | |
102 | -hdfls_LDADD = ../src/libdf.a | |
103 | -hdfls_DEPENDENCIES = ../src/libdf.a | |
104 | +hdfls_LDADD = ../src/libdf.la | |
105 | +hdfls_DEPENDENCIES = ../src/libdf.la | |
106 | ||
107 | hdfpack_SOURCES = hdfpack.c | |
108 | -hdfpack_LDADD = ../src/libdf.a | |
109 | -hdfpack_DEPENDENCIES = ../src/libdf.a | |
110 | +hdfpack_LDADD = ../src/libdf.la | |
111 | +hdfpack_DEPENDENCIES = ../src/libdf.la | |
112 | ||
113 | hdftopal_SOURCES = hdftopal.c | |
114 | -hdftopal_LDADD = ../src/libdf.a | |
115 | -hdftopal_DEPENDENCIES = ../src/libdf.a | |
116 | +hdftopal_LDADD = ../src/libdf.la | |
117 | +hdftopal_DEPENDENCIES = ../src/libdf.la | |
118 | ||
119 | hdftor8_SOURCES = hdftor8.c | |
120 | -hdftor8_LDADD = ../src/libdf.a | |
121 | -hdftor8_DEPENDENCIES = ../src/libdf.a | |
122 | +hdftor8_LDADD = ../src/libdf.la | |
123 | +hdftor8_DEPENDENCIES = ../src/libdf.la | |
124 | ||
125 | hdfunpac_SOURCES = hdfunpac.c | |
126 | -hdfunpac_LDADD = ../src/libdf.a | |
127 | -hdfunpac_DEPENDENCIES = ../src/libdf.a | |
128 | +hdfunpac_LDADD = ../src/libdf.la | |
129 | +hdfunpac_DEPENDENCIES = ../src/libdf.la | |
130 | ||
131 | jpeg2hdf_SOURCES = jpeg2hdf.c | |
132 | -jpeg2hdf_LDADD = ../src/libdf.a | |
133 | -jpeg2hdf_DEPENDENCIES = ../src/libdf.a | |
134 | +jpeg2hdf_LDADD = ../src/libdf.la | |
135 | +jpeg2hdf_DEPENDENCIES = ../src/libdf.la | |
136 | ||
137 | paltohdf_SOURCES = paltohdf.c | |
138 | -paltohdf_LDADD = ../src/libdf.a | |
139 | -paltohdf_DEPENDENCIES = ../src/libdf.a | |
140 | +paltohdf_LDADD = ../src/libdf.la | |
141 | +paltohdf_DEPENDENCIES = ../src/libdf.la | |
142 | ||
143 | r8tohdf_SOURCES = r8tohdf.c | |
144 | -r8tohdf_LDADD = ../src/libdf.a | |
145 | -r8tohdf_DEPENDENCIES = ../src/libdf.a | |
146 | +r8tohdf_LDADD = ../src/libdf.la | |
147 | +r8tohdf_DEPENDENCIES = ../src/libdf.la | |
148 | ||
149 | ristosds_SOURCES = ristosds.c | |
150 | -ristosds_LDADD = ../src/libdf.a | |
151 | -ristosds_DEPENDENCIES = ../src/libdf.a | |
152 | +ristosds_LDADD = ../src/libdf.la | |
153 | +ristosds_DEPENDENCIES = ../src/libdf.la | |
154 | ||
155 | vmake_SOURCES = vmake.c | |
156 | -vmake_LDADD = ../src/libdf.a | |
157 | -vmake_DEPENDENCIES = ../src/libdf.a | |
158 | +vmake_LDADD = ../src/libdf.la | |
159 | +vmake_DEPENDENCIES = ../src/libdf.la | |
160 | ||
161 | vshow_SOURCES = vshow.c | |
162 | -vshow_LDADD = ../src/libdf.a | |
163 | -vshow_DEPENDENCIES = ../src/libdf.a | |
164 | +vshow_LDADD = ../src/libdf.la | |
165 | +vshow_DEPENDENCIES = ../src/libdf.la | |
166 | ||
167 | ############################################################################# | |
168 | ## Testing -- Here there be dragons. ## | |
169 | --- HDF4.2r0/mfhdf/dumper/Makefile.am.orig 2003-11-07 19:38:49.000000000 +0100 | |
170 | +++ HDF4.2r0/mfhdf/dumper/Makefile.am 2004-03-06 13:05:56.513529672 +0100 | |
171 | @@ -18,8 +18,8 @@ | |
172 | ## Information for building the "hdp" program | |
173 | hdp_SOURCES = hdp.c hdp_dump.c hdp_gr.c hdp_list.c hdp_rig.c hdp_sds.c \ | |
174 | hdp_util.c hdp_vd.c hdp_vg.c show.c | |
175 | -hdp_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
176 | -hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
177 | +hdp_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
178 | +hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
179 | ||
180 | ############################################################################# | |
181 | ## Testing -- Here there be dragons. ## | |
182 | --- HDF4.2r0/mfhdf/fortran/Makefile.am.orig 2003-11-24 23:11:25.000000000 +0100 | |
183 | +++ HDF4.2r0/mfhdf/fortran/Makefile.am 2004-03-06 13:06:25.466128208 +0100 | |
184 | @@ -19,13 +19,13 @@ | |
185 | ||
186 | ftest_SOURCES = ftest.f | |
187 | ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \ | |
188 | - ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
189 | + ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
190 | ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \ | |
191 | - $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
192 | + $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
193 | ||
194 | hdftest_SOURCES = hdftest.f | |
195 | -hdftest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
196 | -hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
197 | +hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
198 | +hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
199 | ||
200 | testdir: | |
201 | -mkdir testdir | |
202 | --- HDF4.2r0/mfhdf/hdfimport/Makefile.am.orig 2003-11-07 19:38:54.000000000 +0100 | |
203 | +++ HDF4.2r0/mfhdf/hdfimport/Makefile.am 2004-03-06 13:06:58.422118136 +0100 | |
204 | @@ -17,8 +17,8 @@ | |
205 | bin_PROGRAMS = hdfimport | |
206 | ||
207 | hdfimport_SOURCES = hdfimport.c | |
208 | -hdfimport_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
209 | -hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
210 | +hdfimport_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
211 | +hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
212 | ||
213 | ############################################################################# | |
214 | ## Testing -- Here there be dragons. ## | |
215 | @@ -28,8 +28,8 @@ | |
216 | check_SCRIPTS = testutil.sh | |
217 | ||
218 | hdfimporttest_SOURCES = hdfimporttest.c | |
219 | -hdfimporttest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
220 | -hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
221 | +hdfimporttest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
222 | +hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
223 | ||
224 | check: hdfimporttest | |
225 | @$(SHELL) ./testutil.sh | |
226 | --- HDF4.2r0/mfhdf/hdiff/Makefile.am.orig 2003-11-20 22:54:42.000000000 +0100 | |
227 | +++ HDF4.2r0/mfhdf/hdiff/Makefile.am 2004-03-06 13:07:23.991231040 +0100 | |
228 | @@ -20,8 +20,8 @@ | |
229 | hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \ | |
230 | hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \ | |
231 | hdiff_table.c hdiff_vs.c | |
232 | -hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
233 | -hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
234 | +hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
235 | +hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
236 | ||
237 | ############################################################################# | |
238 | ## Testing ## | |
239 | @@ -32,8 +32,8 @@ | |
240 | noinst_PROGRAMS = hdifftst | |
241 | ||
242 | hdifftst_SOURCES = hdifftst.c | |
243 | -hdifftst_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
244 | -hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
245 | +hdifftst_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
246 | +hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
247 | ||
248 | check: hdifftst | |
249 | @srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh | |
250 | --- HDF4.2r0/mfhdf/hrepack/Makefile.am.orig 2003-11-11 21:40:13.000000000 +0100 | |
251 | +++ HDF4.2r0/mfhdf/hrepack/Makefile.am 2004-03-06 13:07:52.255934152 +0100 | |
252 | @@ -22,8 +22,8 @@ | |
253 | hrepack_opttable.c hrepack_pal.c hrepack_parse.c \ | |
254 | hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \ | |
255 | hrepack_vg.c hrepack_vs.c | |
256 | -hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a | |
257 | -hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
258 | +hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la | |
259 | +hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
260 | ||
261 | ############################################################################# | |
262 | ## Testing -- Here there be dragons. ## | |
263 | @@ -43,12 +43,12 @@ | |
264 | ../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \ | |
265 | ../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \ | |
266 | ../hdiff/hdiff_vs.c | |
267 | -test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a | |
268 | -test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
269 | +test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la | |
270 | +test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
271 | ||
272 | hrepack_check_SOURCES = hrepack_check.c | |
273 | -hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a | |
274 | -hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
275 | +hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la | |
276 | +hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
277 | ||
278 | check: test_hrepack | |
279 | @srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh | |
2f1bfa95 JB |
280 | --- HDF4.2r1/mfhdf/libsrc/Makefile.am.orig 2005-02-10 02:33:49.000000000 +0100 |
281 | +++ HDF4.2r1/mfhdf/libsrc/Makefile.am 2005-02-27 21:28:16.903427656 +0100 | |
0522bc0d JB |
282 | @@ -13,7 +13,7 @@ |
283 | ## Library to build ## | |
284 | ############################################################################# | |
285 | ||
286 | -lib_LIBRARIES = libmfhdf.a | |
287 | +lib_LTLIBRARIES = libmfhdf.la | |
288 | ||
289 | ## Information for building the "libmfhdf.a" library | |
290 | CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \ | |
291 | @@ -25,21 +25,23 @@ | |
292 | if HDF_BUILD_FORTRAN | |
293 | ||
294 | if HDF_BUILD_XDR | |
295 | -libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES) | |
296 | +libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES) | |
297 | else | |
298 | -libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) | |
299 | +libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) | |
300 | endif | |
301 | ||
302 | else | |
303 | ||
304 | if HDF_BUILD_XDR | |
305 | -libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES) | |
306 | +libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES) | |
307 | else | |
308 | -libmfhdf_a_SOURCES = $(CSOURCES) | |
309 | +libmfhdf_la_SOURCES = $(CSOURCES) | |
310 | endif | |
311 | ||
312 | endif | |
313 | ||
314 | +libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la | |
2bd7f214 | 315 | + |
0522bc0d JB |
316 | include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h |
317 | ||
318 | ############################################################################# | |
2f1bfa95 | 319 | @@ -49,11 +51,11 @@ |
0522bc0d JB |
320 | check_PROGRAMS = cdftest hdftest |
321 | ||
322 | cdftest_SOURCES = cdftest.c | |
323 | -cdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ | |
324 | +cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
325 | ||
2f1bfa95 JB |
326 | hdftest_SOURCES = hdftest.c tszip.c temptySDSs.c tidtypes.c trank0.c \ |
327 | tsd.c | |
0522bc0d JB |
328 | -hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ |
329 | +hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ | |
330 | ||
331 | check: | |
332 | @echo "============================" | |
333 | --- HDF4.2r0/mfhdf/ncdump/Makefile.am.orig 2003-11-07 19:39:00.000000000 +0100 | |
334 | +++ HDF4.2r0/mfhdf/ncdump/Makefile.am 2004-03-06 13:08:09.879255000 +0100 | |
335 | @@ -19,8 +19,8 @@ | |
336 | ||
337 | ## Information for building the "ncdump" program | |
338 | ncdump_SOURCES = dumplib.c ncdump.c vardata.c | |
339 | -ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a | |
340 | -ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
341 | +ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la | |
342 | +ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
343 | ||
344 | check: ncdump $(srcdir)/test0.cdl | |
345 | ../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl | |
2f1bfa95 JB |
346 | --- HDF4.2r1/mfhdf/ncgen/Makefile.am.orig 2004-12-07 00:20:33.000000000 +0100 |
347 | +++ HDF4.2r1/mfhdf/ncgen/Makefile.am 2005-02-27 22:03:03.191263696 +0100 | |
348 | @@ -25,8 +25,8 @@ | |
0522bc0d JB |
349 | ## Information for building the "ncgen" program |
350 | ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \ | |
351 | load.c main.c ncgentab.c | |
352 | -ncgen_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a | |
353 | -ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
354 | +ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la | |
355 | +ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
356 | ||
357 | ## Recipe for building the ncgentab.c file | |
358 | ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c | |
2f1bfa95 JB |
359 | @@ -89,7 +89,7 @@ |
360 | ||
361 | ftest0: ncgen test0.cdl netcdf.inc | |
362 | ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f | |
363 | - $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS) | |
364 | + $(LIBTOOL) --mode=link --tag=F77 $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS) | |
365 | endif | |
366 | ||
367 | netcdf.inc: | |
368 | @@ -103,7 +103,7 @@ | |
369 | ||
370 | ctest0: ncgen $(srcdir)/test0.cdl | |
371 | ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c | |
372 | - $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS) | |
373 | + $(LINK) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS) | |
374 | ||
375 | ############################################################################# | |
376 | ## Miscellaneous ## | |
0522bc0d JB |
377 | --- HDF4.2r0/mfhdf/nctest/Makefile.am.orig 2003-11-07 19:39:09.000000000 +0100 |
378 | +++ HDF4.2r0/mfhdf/nctest/Makefile.am 2004-03-06 13:08:38.075968448 +0100 | |
379 | @@ -22,8 +22,8 @@ | |
380 | error.c misctest.c rec.c slabs.c val.c varget_unlim.c \ | |
381 | varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \ | |
382 | vputget.c vputgetg.c | |
383 | -nctest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a | |
384 | -nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a | |
385 | +nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la | |
386 | +nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la | |
387 | ||
388 | ############################################################################# | |
389 | ## And the cleanup ## | |
390 | --- HDF4.2r0/configure.ac.orig 2003-11-21 21:06:01.000000000 +0100 | |
391 | +++ HDF4.2r0/configure.ac 2004-03-06 12:59:06.973789176 +0100 | |
392 | @@ -166,7 +166,7 @@ | |
393 | AC_PROG_INSTALL | |
394 | AM_PROG_LEX | |
395 | AC_PROG_LN_S | |
396 | -AC_PROG_RANLIB | |
397 | +AC_PROG_LIBTOOL | |
398 | AC_PROG_YACC | |
399 | ||
400 | AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH]) |