1 diff -Nur HDF4.1r4.orig/hdf/src/Makefile.in HDF4.1r4/hdf/src/Makefile.in
2 --- HDF4.1r4.orig/hdf/src/Makefile.in Sun Mar 25 20:02:22 2001
3 +++ HDF4.1r4/hdf/src/Makefile.in Mon Mar 26 13:00:51 2001
5 # Directory in which to install documentation info files.
6 infodir = $(prefix)/info
11 #### ----- host and target specific makefile fragments come in here.-------
12 ### ------------------- end of makefile fragments -------------------------
14 HINCS = $(HDRS) $(FINCS)
17 -.SUFFIXES: .c.o .f.o .installed .finstalled
18 +.SUFFIXES: .c.o .f.o .lo .installed .finstalled
20 # This rule causes ansi2knr to be invoked.
24 $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $<
27 + libtool $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $<
33 + libtool --mode=compile $(FC) $(FFLAGS) -c $<
35 # Rules to make Free format Fortran90 include files from F77 include files
36 # 1) change all col. 1 [Cc] to '!'
37 # 2) change all col. 6 continuation character to '&'
41 @if test -z "$(FMPOOL_FLAGS)"; then \
42 - $(MAKE) $(MFLAGS) $(HDF_FLAGS) libdf.a; \
43 + $(MAKE) $(MFLAGS) $(HDF_FLAGS) libdf.la; \
45 - $(MAKE) $(MFLAGS) $(HDF_FLAGS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" libdf.a; \
46 + $(MAKE) $(MFLAGS) $(HDF_FLAGS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" libdf.la; \
50 @if test -z "$(FMPOOL_FLAGS)"; then \
51 - $(MAKE) $(MFLAGS) $(HDF_FLAGS) nofort-libdf.a; \
52 + $(MAKE) $(MFLAGS) $(HDF_FLAGS) nofort-libdf.la; \
54 - $(MAKE) $(MFLAGS) $(HDF_FLAGS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" nofort-libdf.a; \
55 + $(MAKE) $(MFLAGS) $(HDF_FLAGS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" nofort-libdf.la; \
59 -libdf.a: $(COBJS) $(FOBJS)
60 - -$(RM) $(RMFLAGS) libdf.a
61 -# $(AR) $(ARFLAGS) libdf.a `lorder '$(COBJS) $(FOBJS)' | tsort `
62 - $(AR) $(ARFLAGS) libdf.a $(COBJS) $(FOBJS)
64 -# $(LD) -b -o libdf.sl $(COBJS) $(FOBJS)
66 -nofort-libdf.a: $(COBJS)
67 - -$(RM) $(RMFLAGS) libdf.a
68 -# $(AR) $(ARFLAGS) libdf.a `lorder $(COBJS) | tsort `
69 - $(AR) $(ARFLAGS) libdf.a $(COBJS)
72 -nofort-libdf-inst.a: $(COBJS) $(PCOBJS)
73 - -$(RM) $(RMFLAGS) libdf-inst.a libdf.a
74 - $(AR) $(ARFLAGS) libdf-inst.a $(COBJS) $(PCOBJS)
75 - $(RANLIB) libdf-inst.a
76 - ln -s libdf-inst.a libdf.a
77 +libdf.la: $(COBJS) $(FOBJS)
78 + libtool $(CC) -o libdf.la $(COBJS) $(FOBJS) -lz -ljpeg -lm -rpath /usr/lib
80 +nofort-libdf.la: $(COBJS)
81 + libtool $(CC) -o libdf.la $(COBJS) -lz -ljpeg -lm -rpath /usr/lib
83 +nofort-libdf-inst.la: $(COBJS) $(PCOBJS)
84 + libtool $(CC) -o libdf-inst.la $(COBJS) $(PCOBJS) -lz -ljpeg -lm -rpath /usr/lib
85 + ln -s libdf-inst.la libdf.la
88 #libnostub nofortran: libnofortran .finstalled
92 #debug: libdf.a .installed
97 #load -D$(MACHINE) $(CSRCS) $(TSRCS) -lc
99 install-includes: install-headers
101 install-lib: install-headers
102 - $(INSTALL_DATA) $(TARGETLIB) $(libdir)/$(TARGETLIB).n
103 - ( cd $(libdir) ; $(RANLIB) $(libdir)/$(TARGETLIB).n )
104 - mv -f $(libdir)/$(TARGETLIB).n $(libdir)/$(TARGETLIB)
105 + libtool $(INSTALL_DATA) $(TARGETLIB) $(libdir)
107 install-headers: FORCE
109 diff -Nur HDF4.1r4.orig/hdf/src/src.inc HDF4.1r4/hdf/src/src.inc
110 --- HDF4.1r4.orig/hdf/src/src.inc Sat Feb 6 04:21:48 1999
111 +++ HDF4.1r4/hdf/src/src.inc Mon Mar 26 13:00:51 2001
115 COBJS = $(HCOBJS) $(VCOBJS) $(DFCOBJS) $(MFCOBJS)
116 -HCOBJS=hfile.o herr.o hblocks.o hbuffer.o hcompri.o hextelt.o hkit.o hdfalloc.o \
117 - hcomp.o hbitio.o tbbt.o crle.o cnbit.o mstdio.o cnone.o cskphuff.o \
118 - cdeflate.o bitvect.o atom.o hfiledd.o dynarray.o linklist.o glist.o \
120 +HCOBJS=hfile.lo herr.lo hblocks.lo hbuffer.lo hcompri.lo hextelt.lo hkit.lo hdfalloc.lo \
121 + hcomp.lo hbitio.lo tbbt.lo crle.lo cnbit.lo mstdio.lo cnone.lo cskphuff.lo \
122 + cdeflate.lo bitvect.lo atom.lo hfiledd.lo dynarray.lo linklist.lo glist.lo \
123 + hchunks.lo mcache.lo
125 -VCOBJS=vg.o vrw.o vio.o vparse.o vconv.o vsfld.o vgp.o vhi.o vattr.o
126 +VCOBJS=vg.lo vrw.lo vio.lo vparse.lo vconv.lo vsfld.lo vgp.lo vhi.lo vattr.lo
128 DFCOBJS=$(DFG_COBJS) $(DFAN_COBJS) $(DFSD_COBJS) $(DFRI_COBJS)
129 -DFG_COBJS=dfgroup.o dfconv.o dfufp2i.o dfutil.o dfstubs.o dfknat.o dfkswap.o \
130 - dfkcray.o dfkvms.o dfkconv.o dfkfuji.o
133 -DFRI_COBJS=dfr8.o dfcomp.o dfrle.o dfimcomp.o dfjpeg.o dfunjpeg.o dfp.o \
135 +DFG_COBJS=dfgroup.lo dfconv.lo dfufp2i.lo dfutil.lo dfstubs.lo dfknat.lo dfkswap.lo \
136 + dfkcray.lo dfkvms.lo dfkconv.lo dfkfuji.lo
139 +DFRI_COBJS=dfr8.lo dfcomp.lo dfrle.lo dfimcomp.lo dfjpeg.lo dfunjpeg.lo dfp.lo \
142 MFCOBJS= $(MFAN_COBJS) $(MFGR_COBJS)
148 FSRCS = $(FCSRCS) $(FFSRCS)
149 FCSRCS=$(H_FCSRCS) $(V_FCSRCS) $(DF_FCSRCS) $(DFAN_FCSRCS) $(DFSD_FCSRCS) \
150 @@ -110,25 +110,25 @@
152 FCOBJS=$(H_FCOBJS) $(V_FCOBJS) $(DF_FCOBJS) $(DFAN_FCOBJS) $(DFSD_FCOBJS) \
153 $(DFRI_FCOBJS) $(MFAN_FCOBJS) $(MFGR_FCOBJS)
154 -H_FCOBJS=hfilef.o herrf.o
155 -V_FCOBJS=vgf.o vattrf.o
156 -DF_FCOBJS=dff.o dfutilf.o
159 -DFRI_FCOBJS=dfr8f.o dfpf.o df24f.o
162 +H_FCOBJS=hfilef.lo herrf.lo
163 +V_FCOBJS=vgf.lo vattrf.lo
164 +DF_FCOBJS=dff.lo dfutilf.lo
165 +DFAN_FCOBJS=dfanf.lo
166 +DFSD_FCOBJS=dfsdf.lo
167 +DFRI_FCOBJS=dfr8f.lo dfpf.lo df24f.lo
168 +MFAN_FCOBJS=mfanf.lo
169 +MFGR_FCOBJS=mfgrf.lo
171 FFOBJS=$(H_FFOBJS) $(V_FFOBJS) $(DF_FFOBJS) $(DFAN_FFOBJS) $(DFSD_FFOBJS) \
172 $(DFRI_FFOBJS) $(MFAN_FFOBJS) $(MFGR_FFOBJS)
174 -V_FFOBJS=vgff.o vattrff.o
175 -DF_FFOBJS=dfff.o dfufp2if.o
176 -DFAN_FFOBJS=dfanff.o
177 -DFSD_FFOBJS=dfsdff.o
178 -DFRI_FFOBJS=df24ff.o dfpff.o dfr8ff.o
180 +V_FFOBJS=vgff.lo vattrff.lo
181 +DF_FFOBJS=dfff.lo dfufp2if.lo
182 +DFAN_FFOBJS=dfanff.lo
183 +DFSD_FFOBJS=dfsdff.lo
184 +DFRI_FFOBJS=df24ff.lo dfpff.lo dfr8ff.lo
186 -MFGR_FFOBJS=mfgrff.o
187 +MFGR_FFOBJS=mfgrff.lo
189 F90INCS=dffunc.f90 hdf.f90
190 FINCS=dffunc.inc hdf.inc $(F90INCS)
191 diff -Nur HDF4.1r4.orig/hdf/test/Makefile.in HDF4.1r4/hdf/test/Makefile.in
192 --- HDF4.1r4.orig/hdf/test/Makefile.in Sun Mar 25 20:02:22 2001
193 +++ HDF4.1r4/hdf/test/Makefile.in Mon Mar 26 13:00:51 2001
200 # cd $(HDFLIB); echo Making \`$(TARG)\' in `pwd`; \
201 # $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG);
203 @@ -351,27 +351,27 @@
204 ./fortest > fortest.out
205 @cmp fortest.out fortest.sav && echo "*** Fortran tests passed ***";
207 -qtesthdf: $(COBJS) $(HDFLIB)/libdf.a
208 - quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a -ljpeg -lz -lm
209 +qtesthdf: $(COBJS) $(HDFLIB)/libdf.la
210 + quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) -L../src/.libs -ldf -ljpeg -lz -lm
212 -ptesthdf: $(COBJS) $(HDFLIB)/libdf.a
213 - purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a -ljpeg -lz -lm
214 +ptesthdf: $(COBJS) $(HDFLIB)/libdf.la
215 + purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) -L../src/.libs -ldf -ljpeg -lz -lm
217 -testhdf.tc: $(COBJS) $(HDFLIB)/libdf.a
218 - proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a -ljpeg -lz -lm
219 +testhdf.tc: $(COBJS) $(HDFLIB)/libdf.la
220 + proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) -L../src/.libs -ldf -ljpeg -lz -lm
222 -testhdf: $(COBJS) $(HDFLIB)/libdf.a
223 - $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a -ljpeg -lz -lm
224 +testhdf: $(COBJS) $(HDFLIB)/libdf.la
225 + $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) -L../src/.libs -ldf -ljpeg -lz -lm
226 test -d $(TESTDIR) || mkdir $(TESTDIR)
228 -fortestF: $(FOBJS) $(HDFLIB)/libdf.a
229 - $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a -ljpeg -lz -lm
230 +fortestF: $(FOBJS) $(HDFLIB)/libdf.la
231 + $(FC) $(FFLAGS) -o $@ $(FOBJS) -L../src/.libs -ldf -ljpeg -lz -lm
233 -fortest: $(HDFLIB)/libdf.a fortest.c $(CHDRS)
234 - $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a -ljpeg -lz -lm
235 +fortest: $(HDFLIB)/libdf.la fortest.c $(CHDRS)
236 + $(CC) $(ALL_CFLAGS) -o fortest fortest.c -L../src/.libs -ldf -ljpeg -lz -lm
238 -gentest: gentest.c $(HDFLIB)/libdf.a
239 - $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a -ljpeg -lz -lm
240 +gentest: gentest.c $(HDFLIB)/libdf.la
241 + $(CC) $(ALL_CFLAGS) gentest.c -o gentest -L../src/.libs -ldf -ljpeg -lz -lm
245 diff -Nur HDF4.1r4.orig/hdf/util/Makefile.in HDF4.1r4/hdf/util/Makefile.in
246 --- HDF4.1r4.orig/hdf/util/Makefile.in Sun Mar 25 20:02:22 2001
247 +++ HDF4.1r4/hdf/util/Makefile.in Mon Mar 26 13:00:51 2001
248 @@ -217,29 +217,29 @@
250 # $(CC) $(CFLAGS) -c -I$(HDFINC) -I$(UTILINC) -I$(JPEGINC) -I$(ZLIBINC) $*.c
252 -.c.o: he.h he_proto.h $(HDFLIB)/libdf.a $(FRC)
253 +.c.o: he.h he_proto.h $(HDFLIB)/libdf.la $(FRC)
254 $(CC) $(ALL_CFLAGS) -c $<
256 -.c: $(HDFLIB)/libdf.a
257 - $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a -ljpeg -lz $(LIBSX)
258 +.c: $(HDFLIB)/libdf.la
259 + $(CC) $(ALL_CFLAGS) $< -o $@ -L../src/.libs -ldf -ljpeg -lz $(LIBSX)
261 -.f: $(HDFLIB)/libdf.a
262 - $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ -ljpeg -lz
263 +.f: $(HDFLIB)/libdf.la
264 + $(FC) $(FFLAGS) $< -o $@ -L../src/.libs -ldf -ljpeg -lz
266 -hdfed: he.h he_proto.h $(HEOBJ) $(HDFLIB)/libdf.a $(FRC)
267 - $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed -ljpeg -lz
268 +hdfed: he.h he_proto.h $(HEOBJ) $(HDFLIB)/libdf.la $(FRC)
269 + $(CC) $(ALL_CFLAGS) $(HEOBJ) -L../src/.libs -ldf -o hdfed -ljpeg -lz
271 -gif2hdf: gif.h $(GHOBJ) $(HDFLIB)/libdf.a $(FRC)
272 - $(CC) $(ALL_CFLAGS) $(GHOBJ) $(HDFLIB)/libdf.a -o gif2hdf -ljpeg -lz
273 +gif2hdf: gif.h $(GHOBJ) $(HDFLIB)/libdf.la $(FRC)
274 + $(CC) $(ALL_CFLAGS) $(GHOBJ) -L../src/.libs -ldf -o gif2hdf -ljpeg -lz
276 -hdf2gif: gif.h $(HGOBJ) $(HDFLIB)/libdf.a $(FRC)
277 - $(CC) $(ALL_CFLAGS) $(HGOBJ) $(HDFLIB)/libdf.a -o hdf2gif -ljpeg -lz
278 +hdf2gif: gif.h $(HGOBJ) $(HDFLIB)/libdf.la $(FRC)
279 + $(CC) $(ALL_CFLAGS) $(HGOBJ) -L../src/.libs -ldf -o hdf2gif -ljpeg -lz
281 -utils: $(UTILS) $(HDFLIB)/libdf.a $(FRC)
282 +utils: $(UTILS) $(HDFLIB)/libdf.la $(FRC)
290 -$(RM) $(RMFLAGS) *.o $(UTILS) hdfed fptest
291 diff -Nur HDF4.1r4.orig/mfhdf/Makefile.in HDF4.1r4/mfhdf/Makefile.in
292 --- HDF4.1r4.orig/mfhdf/Makefile.in Wed Aug 30 02:11:10 2000
293 +++ HDF4.1r4/mfhdf/Makefile.in Mon Mar 26 13:00:51 2001
294 @@ -131,10 +131,10 @@
295 ncdump/install-man ncgen/install-man \
296 xdr/install-includes fortran/install-includes libsrc/install-includes
298 -all:: port/all xdr/all libsrc/all fortran/all ncdump/all \
299 +all:: port/all xdr/all fortran/all libsrc/all ncdump/all \
300 ncgen/all nctest/all doc/all dumper/all pablo/all
301 -libmfhdf:: port/all xdr/all libsrc/all fortran/all
302 -libmfhdf-inst:: port/all xdr/all libsrc/all fortran/all pablo/all
303 +libmfhdf:: port/all xdr/all fortran/all libsrc/all
304 +libmfhdf-inst:: port/all xdr/all fortran/all libsrc/all pablo/all
305 test:: xdr/test libsrc/test nctest/test fortran/test ncdump/test \
306 ncgen/test dumper/test
307 install:: xdr/install fortran/install libsrc/install ncdump/install \
308 diff -Nur HDF4.1r4.orig/mfhdf/dumper/Makefile.in HDF4.1r4/mfhdf/dumper/Makefile.in
309 --- HDF4.1r4.orig/mfhdf/dumper/Makefile.in Sun Mar 25 20:02:22 2001
310 +++ HDF4.1r4/mfhdf/dumper/Makefile.in Mon Mar 26 13:00:51 2001
313 # ------------ General Macros for NETCDF --------------------
314 INCDIR = $(prefix)/include
315 -HDF_LIB = $(TOP_SRCDIR)/hdf/src/libdf.a
316 +HDF_LIB = -L../../hdf/src/.libs -ldf
317 HDF_INC = $(TOP_SRCDIR)/hdf/src/
318 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
319 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
321 LD_NETCDF = ../libsrc/libmfhdf.a
322 OBJS = hdp.o hdp_list.o hdp_sds.o hdp_util.o hdp_vd.o hdp_vg.o hdp_rig.o show.o hdp_dump.o hdp_gr.o
324 -LD_NETCDF = -L../libsrc -lmfhdf
325 +LD_NETCDF = -L../libsrc/.libs -lmfhdf
326 LIBS = $(LD_NETCDF) $(LD_XDR) $(HDF_LIB) $(LIBSX) $(JPEG_LIB) $(ZLIB_LIB)
328 GARBAGE = $(PROGRAM) *.o
330 $(MAKE) $(MFLAGS) $(LOCAL_MACROS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" $(PROGRAM); \
333 -debug: $(PROGRAM) ../libsrc/libmfhdf.a
334 +debug: $(PROGRAM) ../libsrc/libmfhdf.la
335 purify $(CC) $(CFLAGS) $(CFLAGS_NETCDF) $(OBJS) $(LIBS) -o phdp
338 diff -Nur HDF4.1r4.orig/mfhdf/fortran/Makefile.in HDF4.1r4/mfhdf/fortran/Makefile.in
339 --- HDF4.1r4.orig/mfhdf/fortran/Makefile.in Sun Mar 25 20:02:22 2001
340 +++ HDF4.1r4/mfhdf/fortran/Makefile.in Mon Mar 26 13:00:51 2001
342 config/netcdf-convex.inc config/jackets-convex.c config/ftest-convex.f \
343 config/netcdf-unicos.inc config/jackets-unicos.c config/ftest-unicos.f
345 -LIBOBJS = jackets.o mfsdf.o mfsdff.o
346 +LIBOBJS = jackets.lo mfsdf.lo mfsdff.lo
348 #REMOTE_LIBRARY = ../libsrc/lib$(LIBNAME).a
349 REMOTE_LIBRARY = $(srcdir)/../libsrc/lib$(LIBNAME).a
353 @if test -z "$(FMPOOL_FLAGS)"; then \
354 - $(MAKE) $(MFLAGS) $(LOCAL_MACROS) netcdf.inc $(REMOTE_LIBRARY); \
355 + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) netcdf.inc $(LIBOBJS); \
357 - $(MAKE) $(MFLAGS) $(LOCAL_MACROS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" netcdf.inc $(REMOTE_LIBRARY); \
358 + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" netcdf.inc $(LIBOBJS); \
366 -.SUFFIXES: .so .o .i .c .fc .f .F .l .y
367 +.SUFFIXES: .so .o .lo .i .c .fc .f .F .l .y
369 # ###########################################################################
370 # General Macros: (moved to make file fragment )
374 $(FC) -c $(FFLAGS) $<
376 + libtool --mode=compile $(FC) -c $(FFLAGS) $<
379 && $(CPP) -DUD_FORTRAN_SOURCE $(CPPFLAGS) $(CPPFLAGS_NETCDF) $$$$.c \
383 $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $<
385 + libtool $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $<
387 # Compile lex(1) code. This rule is here to ensure the use of CPPFLAGS.
389 diff -Nur HDF4.1r4.orig/mfhdf/libsrc/Makefile.in HDF4.1r4/mfhdf/libsrc/Makefile.in
390 --- HDF4.1r4.orig/mfhdf/libsrc/Makefile.in Sun Mar 25 20:02:22 2001
391 +++ HDF4.1r4/mfhdf/libsrc/Makefile.in Mon Mar 26 13:00:51 2001
394 # ------------ General Macros for NETCDF --------------------
395 INCDIR = $(prefix)/include
396 -HDF_LIB = $(TOP_SRCDIR)/hdf/src/libdf.a
397 +HDF_LIB = -L../../hdf/src/.libs -ldf
398 HDF_INC = $(TOP_SRCDIR)/hdf/src/
399 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
400 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
401 @@ -140,15 +140,16 @@
402 config/netcdf-solarisx86.h config/netcdf-convex.h \
403 config/netcdf-unicos.h
405 -LIBOBJS = array.o attr.o cdf.o dim.o file.o iarray.o error.o \
406 - globdef.o putget.o putgetg.o sharray.o string.o var.o \
407 - $(XDRFILE).o hdfsds.o mfsd.o nssdc.o
408 +LIBOBJS = array.lo attr.lo cdf.lo dim.lo file.lo iarray.lo error.lo \
409 + globdef.lo putget.lo putgetg.lo sharray.lo string.lo var.lo \
410 + $(XDRFILE).lo hdfsds.lo mfsd.lo nssdc.lo \
411 + ../fortran/jackets.lo ../fortran/mfsdf.lo ../fortran/mfsdff.lo
413 DEBUGLIBRARY = mfhdf_g
414 PROFILEDLIBRARY = mfhdf_pg
416 +OBJS = $(PROGRAM).lo
418 -LD_NETCDF = libmfhdf.a
419 +LD_NETCDF = libmfhdf.la
420 LIBS = $(LD_NETCDF) $(LD_XDR) $(HDF_LIB) $(JPEG_LIB) $(LIBSX) $(ZLIB_LIB)
427 -.SUFFIXES: .so .o .i .c .fc .f .F .l .y
428 +.SUFFIXES: .so .o .lo .i .c .fc .f .F .l .y
430 # ###########################################################################
431 # General Macros: (moved to make file fragment )
435 $(FC) -c $(FFLAGS) $<
437 + libtool --mode=compile $(FC) -c $(FFLAGS) $<
440 && $(CPP) -DUD_FORTRAN_SOURCE $(CPPFLAGS) $(CPPFLAGS_NETCDF) $$$$.c \
444 $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $<
446 + libtool $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $<
448 # Compile lex(1) code. This rule is here to ensure the use of CPPFLAGS.
452 $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $*.c
456 + $(LEX) -t $< > $*.c
457 + libtool $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $*.c
463 # ###########################################################################
465 LIBDIR = $(prefix)/lib
466 -LIB_A = lib$(LIBRARY).a
467 +LIB_A = lib$(LIBRARY).la
472 # makefile in another directory prior to the execution of the following rule.
474 $(LIB_A): $(LIBOBJS) FORCE
475 - $(AR) rcuv $@ $(LIBOBJS)
477 -# $(LD) -b -o libmfhdf.sl $(LIBOBJS)
478 + libtool $(CC) -o $(LIB_A) $(LIBOBJS) -L../../hdf/src/.libs -ldf -lz -ljpeg -lm -rpath /usr/lib
480 # The following rule is for those makefiles needing to install object
481 # modules in a library in another directory. They need only define
483 installed_libfile: $(LIBDIR)/$(LIBFILE)
485 $(LIBDIR)/$(LIBFILE): $(LIBDIR) $(LIBFILE)
486 - $(INSTALL_DATA) $(LIBFILE) $@
487 + libtool $(INSTALL_DATA) $(LIBFILE) $@
489 dummy_libdir $(LIBDIR):
491 diff -Nur HDF4.1r4.orig/mfhdf/ncdump/Makefile.in HDF4.1r4/mfhdf/ncdump/Makefile.in
492 --- HDF4.1r4.orig/mfhdf/ncdump/Makefile.in Sun Mar 25 20:02:22 2001
493 +++ HDF4.1r4/mfhdf/ncdump/Makefile.in Mon Mar 26 13:00:51 2001
496 # ------------ General Macros for NETCDF --------------------
497 INCDIR = $(prefix)/include
498 -HDF_LIB = $(TOP_SRCDIR)/hdf/src/libdf.a
499 +HDF_LIB = -L../../hdf/src/.libs -ldf
500 HDF_INC = $(TOP_SRCDIR)/hdf/src/
501 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
502 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
504 LD_NETCDF = ../libsrc/libmfhdf.a
505 OBJS = ncdump.o vardata.o dumplib.o
507 -LD_NETCDF = -L../libsrc -lmfhdf
508 +LD_NETCDF = -L../libsrc/.libs -lmfhdf
509 LIBS = $(LD_NETCDF) $(LD_XDR) $(HDF_LIB) $(JPEG_LIB) $(ZLIB_LIB) $(LIBSX)
511 GARBAGE = $(PROGRAM) test0.nc test1.nc test1.cdl test2.cdl
512 diff -Nur HDF4.1r4.orig/mfhdf/ncgen/Makefile.in HDF4.1r4/mfhdf/ncgen/Makefile.in
513 --- HDF4.1r4.orig/mfhdf/ncgen/Makefile.in Sun Mar 25 20:02:22 2001
514 +++ HDF4.1r4/mfhdf/ncgen/Makefile.in Mon Mar 26 13:00:51 2001
517 # ------------ General Macros for NETCDF --------------------
518 INCDIR = $(prefix)/include
519 -HDF_LIB = $(TOP_SRCDIR)/hdf/src/libdf.a
520 +HDF_LIB = -L../../hdf/src/.libs -ldf
521 HDF_INC = $(TOP_SRCDIR)/hdf/src/
522 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
523 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
528 -LD_NETCDF = ../libsrc/libmfhdf.a $(HDF_LIB) $(JPEG_LIB) $(ZLIB_LIB)
529 +LD_NETCDF = -L../libsrc/.libs -lmfhdf $(HDF_LIB) $(JPEG_LIB) $(ZLIB_LIB)
530 OBJS = main.o generate.o load.o ncgentab.o escapes.o \
531 getfill.o init.o close.o genlib.o
533 diff -Nur HDF4.1r4.orig/mfhdf/nctest/Makefile.in HDF4.1r4/mfhdf/nctest/Makefile.in
534 --- HDF4.1r4.orig/mfhdf/nctest/Makefile.in Sun Mar 25 20:02:22 2001
535 +++ HDF4.1r4/mfhdf/nctest/Makefile.in Mon Mar 26 13:02:23 2001
538 # ------------ General Macros for NETCDF --------------------
539 INCDIR = $(prefix)/include
540 -HDF_LIB = $(TOP_SRCDIR)/hdf/src/libdf.a
541 +HDF_LIB = -L../../hdf/src/.libs -ldf
542 HDF_INC = $(TOP_SRCDIR)/hdf/src/
543 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
544 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
546 tests.h val.c val.h vardef.c varget.c vargetg.c varput.c \
547 varputg.c vartests.c vputget.c vputgetg.c make.com
549 -LD_NETCDF = ../libsrc/libmfhdf.a
550 +LD_NETCDF = -L../libsrc/.libs -lmfhdf
551 SRCS = varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
552 vputget.c vputgetg.c driver.c cdftests.c dimtests.c rec.c \
553 atttests.c misctest.c add.c error.c emalloc.c val.c slabs.c
554 @@ -142,17 +142,17 @@
555 @ echo "==========================="
558 -$(PROGRAM): ../libsrc/libmfhdf.a
559 +$(PROGRAM): ../libsrc/libmfhdf.la
564 $(CC) $(CFLAGS) $(CFLAGS_NETCDF) nctime.o $(LIBS) -o $@
566 -debug: ../libsrc/libmfhdf.a
567 +debug: ../libsrc/libmfhdf.la
568 purify $(CC) $(CFLAGS) $(CFLAGS_NETCDF) $(OBJS) $(LIBS) -o pnctest
570 -perfs: ../libsrc/libmfhdf.a
571 +perfs: ../libsrc/libmfhdf.la
572 quantify $(CC) $(CFLAGS) $(CFLAGS_NETCDF) $(OBJS) $(LIBS) -o qnctest