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
5 #############################################################################
7 -lib_LIBRARIES = libdf.a
8 +lib_LTLIBRARIES = libdf.la
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 \
13 FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
16 -libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
17 +libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
18 include_HEADERS = $(CHEADERS) $(FHEADERS)
20 -libdf_a_SOURCES = $(CSOURCES)
21 +libdf_la_SOURCES = $(CSOURCES)
22 include_HEADERS = $(CHEADERS)
25 --- HDF4.2r0/hdf/test/Makefile.am.orig 2003-11-07 19:38:42.000000000 +0100
26 +++ HDF4.2r0/hdf/test/Makefile.am 2004-03-06 13:02:57.182792088 +0100
28 mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \
29 testhdf.c tree.c tszip.c tvattr.c tvset.c tvsfpack.c \
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
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
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 \
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
205 bin_PROGRAMS = hdfimport
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
213 #############################################################################
214 ## Testing -- Here there be dragons. ##
216 check_SCRIPTS = testutil.sh
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
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
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
237 #############################################################################
240 noinst_PROGRAMS = hdifftst
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
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
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
261 #############################################################################
262 ## Testing -- Here there be dragons. ##
264 ../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \
265 ../hdiff/hdiff_sds.c ../hdiff/hdiff_table.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
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
279 @srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh
280 --- HDF4.2r0/mfhdf/libsrc/Makefile.am.orig 2003-11-07 00:07:00.000000000 +0100
281 +++ HDF4.2r0/mfhdf/libsrc/Makefile.am 2004-03-06 13:01:51.351799920 +0100
283 ## Library to build ##
284 #############################################################################
286 -lib_LIBRARIES = libmfhdf.a
287 +lib_LTLIBRARIES = libmfhdf.la
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 \
295 -libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
296 +libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
298 -libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
299 +libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
305 -libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES)
306 +libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
308 -libmfhdf_a_SOURCES = $(CSOURCES)
309 +libmfhdf_la_SOURCES = $(CSOURCES)
314 +libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
316 include_HEADERS = hdf2netcdf.h local_nc.h mfhdf.h netcdf.h
318 #############################################################################
320 check_PROGRAMS = cdftest hdftest
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@
326 hdftest_SOURCES = hdftest.c tszip.c
327 -hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
328 +hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
331 @echo "============================"
332 --- HDF4.2r0/mfhdf/ncdump/Makefile.am.orig 2003-11-07 19:39:00.000000000 +0100
333 +++ HDF4.2r0/mfhdf/ncdump/Makefile.am 2004-03-06 13:08:09.879255000 +0100
336 ## Information for building the "ncdump" program
337 ncdump_SOURCES = dumplib.c ncdump.c vardata.c
338 -ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
339 -ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
340 +ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
341 +ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
343 check: ncdump $(srcdir)/test0.cdl
344 ../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
345 --- HDF4.2r0/mfhdf/ncgen/Makefile.am.orig 2003-11-07 19:39:04.000000000 +0100
346 +++ HDF4.2r0/mfhdf/ncgen/Makefile.am 2004-03-06 13:08:24.349055256 +0100
348 ## Information for building the "ncgen" program
349 ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \
350 load.c main.c ncgentab.c
351 -ncgen_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
352 -ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
353 +ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
354 +ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
356 ## Recipe for building the ncgentab.c file
357 ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c
358 --- HDF4.2r0/mfhdf/nctest/Makefile.am.orig 2003-11-07 19:39:09.000000000 +0100
359 +++ HDF4.2r0/mfhdf/nctest/Makefile.am 2004-03-06 13:08:38.075968448 +0100
361 error.c misctest.c rec.c slabs.c val.c varget_unlim.c \
362 varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
364 -nctest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
365 -nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
366 +nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
367 +nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
369 #############################################################################
370 ## And the cleanup ##
371 --- HDF4.2r0/configure.ac.orig 2003-11-21 21:06:01.000000000 +0100
372 +++ HDF4.2r0/configure.ac 2004-03-06 12:59:06.973789176 +0100
381 AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])