]>
Commit | Line | Data |
---|---|---|
2bd7f214 JB |
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 | |
4 | @@ -123,7 +123,7 @@ | |
5 | # Directory in which to install documentation info files. | |
6 | infodir = $(prefix)/info | |
7 | ||
8 | -TARGETLIB = libdf.a | |
9 | +TARGETLIB = libdf.la | |
10 | ||
11 | #### ----- host and target specific makefile fragments come in here.------- | |
12 | ### ------------------- end of makefile fragments ------------------------- | |
13 | @@ -189,7 +189,7 @@ | |
14 | HINCS = $(HDRS) $(FINCS) | |
15 | ||
16 | #.SUFFIXES: | |
17 | -.SUFFIXES: .c.o .f.o .installed .finstalled | |
18 | +.SUFFIXES: .c.o .f.o .lo .installed .finstalled | |
19 | ||
20 | # This rule causes ansi2knr to be invoked. | |
21 | #@ISANSICOM@.c.o: | |
22 | @@ -204,9 +204,15 @@ | |
23 | .c.o: | |
24 | $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< | |
25 | ||
26 | +.c.lo: | |
dbb503af | 27 | + libtool --mode=compile $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< |
2bd7f214 JB |
28 | + |
29 | .f.o: | |
30 | $(FC) $(FFLAGS) -c $< | |
31 | ||
32 | +.f.lo: | |
f31ffbfc | 33 | + libtool --mode=compile $(LTTAG) $(FC) $(FFLAGS) -c $< |
2bd7f214 JB |
34 | + |
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 '&' | |
38 | @@ -229,37 +235,28 @@ | |
39 | ||
40 | rall:: FORCE | |
41 | @if test -z "$(FMPOOL_FLAGS)"; then \ | |
42 | - $(MAKE) $(MFLAGS) $(HDF_FLAGS) libdf.a; \ | |
43 | + $(MAKE) $(MFLAGS) $(HDF_FLAGS) libdf.la; \ | |
44 | else \ | |
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; \ | |
47 | fi | |
48 | ||
49 | libnofortran:: FORCE | |
50 | @if test -z "$(FMPOOL_FLAGS)"; then \ | |
51 | - $(MAKE) $(MFLAGS) $(HDF_FLAGS) nofort-libdf.a; \ | |
52 | + $(MAKE) $(MFLAGS) $(HDF_FLAGS) nofort-libdf.la; \ | |
53 | else \ | |
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; \ | |
56 | fi | |
57 | ||
58 | ||
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) | |
63 | - $(RANLIB) libdf.a | |
64 | -# $(LD) -b -o libdf.sl $(COBJS) $(FOBJS) | |
65 | - | |
66 | -nofort-libdf.a: $(COBJS) | |
67 | - -$(RM) $(RMFLAGS) libdf.a | |
68 | -# $(AR) $(ARFLAGS) libdf.a `lorder $(COBJS) | tsort ` | |
69 | - $(AR) $(ARFLAGS) libdf.a $(COBJS) | |
70 | - $(RANLIB) libdf.a | |
71 | - | |
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) | |
09440d7a | 78 | + libtool --mode=link $(CC) -o libdf.la $(COBJS) $(FOBJS) -lz -ljpeg -lm -rpath $(libdir) |
2bd7f214 JB |
79 | + |
80 | +nofort-libdf.la: $(COBJS) | |
09440d7a | 81 | + libtool --mode=link $(CC) -o libdf.la $(COBJS) -lz -ljpeg -lm -rpath $(libdir) |
2bd7f214 JB |
82 | + |
83 | +nofort-libdf-inst.la: $(COBJS) $(PCOBJS) | |
09440d7a | 84 | + libtool --mode=link $(CC) -o libdf-inst.la $(COBJS) $(PCOBJS) -lz -ljpeg -lm -rpath $(libdir) |
2bd7f214 JB |
85 | + ln -s libdf-inst.la libdf.la |
86 | ||
87 | ||
88 | #libnostub nofortran: libnofortran .finstalled | |
89 | @@ -277,7 +274,7 @@ | |
90 | $(FOBJS): $(FRC) | |
91 | ||
92 | #debug: libdf.a .installed | |
93 | -debug: libdf.a | |
94 | +debug: libdf.la | |
95 | ||
96 | saber: | |
97 | #load -D$(MACHINE) $(CSRCS) $(TSRCS) -lc | |
98 | @@ -287,9 +284,7 @@ | |
99 | install-includes: install-headers | |
100 | ||
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) | |
dbb503af | 105 | + libtool --mode=install $(INSTALL_DATA) $(TARGETLIB) $(libdir) |
2bd7f214 JB |
106 | |
107 | install-headers: FORCE | |
108 | @case "$(FC)" in \ | |
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 | |
112 | @@ -64,24 +64,24 @@ | |
113 | MFGR_CSRCS=mfgr.c | |
114 | ||
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 \ | |
119 | - hchunks.o mcache.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 | |
124 | ||
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 | |
127 | ||
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 | |
131 | -DFAN_COBJS=dfan.o | |
132 | -DFSD_COBJS=dfsd.o | |
133 | -DFRI_COBJS=dfr8.o dfcomp.o dfrle.o dfimcomp.o dfjpeg.o dfunjpeg.o dfp.o \ | |
134 | - dfgr.o df24.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 | |
137 | +DFAN_COBJS=dfan.lo | |
138 | +DFSD_COBJS=dfsd.lo | |
139 | +DFRI_COBJS=dfr8.lo dfcomp.lo dfrle.lo dfimcomp.lo dfjpeg.lo dfunjpeg.lo dfp.lo \ | |
140 | + dfgr.lo df24.lo | |
141 | ||
142 | MFCOBJS= $(MFAN_COBJS) $(MFGR_COBJS) | |
143 | -MFAN_COBJS=mfan.o | |
144 | -MFGR_COBJS=mfgr.o | |
145 | +MFAN_COBJS=mfan.lo | |
146 | +MFGR_COBJS=mfgr.lo | |
147 | ||
148 | FSRCS = $(FCSRCS) $(FFSRCS) | |
149 | FCSRCS=$(H_FCSRCS) $(V_FCSRCS) $(DF_FCSRCS) $(DFAN_FCSRCS) $(DFSD_FCSRCS) \ | |
150 | @@ -110,25 +110,25 @@ | |
151 | ||
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 | |
157 | -DFAN_FCOBJS=dfanf.o | |
158 | -DFSD_FCOBJS=dfsdf.o | |
159 | -DFRI_FCOBJS=dfr8f.o dfpf.o df24f.o | |
160 | -MFAN_FCOBJS=mfanf.o | |
161 | -MFGR_FCOBJS=mfgrf.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 | |
170 | ||
171 | FFOBJS=$(H_FFOBJS) $(V_FFOBJS) $(DF_FFOBJS) $(DFAN_FFOBJS) $(DFSD_FFOBJS) \ | |
172 | $(DFRI_FFOBJS) $(MFAN_FFOBJS) $(MFGR_FFOBJS) | |
173 | -H_FFOBJS=hfileff.o | |
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 | |
179 | +H_FFOBJS=hfileff.lo | |
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 | |
185 | MFAN_FFOBJS= | |
186 | -MFGR_FFOBJS=mfgrff.o | |
187 | +MFGR_FFOBJS=mfgrff.lo | |
188 | ||
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 | |
194 | @@ -306,7 +306,7 @@ | |
195 | ||
196 | debug: ptesthdf | |
197 | ||
198 | -$(HDFLIB)/libdf.a: | |
199 | +$(HDFLIB)/libdf.la: | |
200 | # cd $(HDFLIB); echo Making \`$(TARG)\' in `pwd`; \ | |
201 | # $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG); | |
202 | ||
203 | @@ -351,27 +351,27 @@ | |
204 | ./fortest > fortest.out | |
205 | @cmp fortest.out fortest.sav && echo "*** Fortran tests passed ***"; | |
206 | ||
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 | |
211 | ||
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 | |
216 | ||
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 | |
221 | ||
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) | |
227 | ||
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 | |
232 | ||
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 | |
237 | ||
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 | |
242 | ||
243 | ftests: $(FTESTS) | |
244 | ||
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 @@ | |
249 | #.c.o: | |
250 | # $(CC) $(CFLAGS) -c -I$(HDFINC) -I$(UTILINC) -I$(JPEGINC) -I$(ZLIBINC) $*.c | |
251 | ||
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 $< | |
255 | ||
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) | |
260 | ||
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 | |
265 | ||
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 | |
270 | ||
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 | |
275 | ||
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 | |
280 | ||
281 | -utils: $(UTILS) $(HDFLIB)/libdf.a $(FRC) | |
282 | +utils: $(UTILS) $(HDFLIB)/libdf.la $(FRC) | |
283 | ||
284 | $(HEOBJ): $(FRC) | |
285 | ||
286 | -$(HDFLIB)/libdf.a: | |
287 | +$(HDFLIB)/libdf.la: | |
288 | ||
289 | clean: | |
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 | |
297 | ||
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 | |
311 | @@ -76,7 +76,7 @@ | |
312 | ||
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 | |
320 | @@ -126,7 +126,7 @@ | |
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 | |
323 | #LD_XDR = @LD_XDR@ | |
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) | |
327 | prefix = ../../.. | |
328 | GARBAGE = $(PROGRAM) *.o | |
329 | @@ -139,7 +139,7 @@ | |
330 | $(MAKE) $(MFLAGS) $(LOCAL_MACROS) FMPOOL_FLAGS="$(FMPOOL_FLAGS) -I$(FMPOOL_INC)" $(PROGRAM); \ | |
331 | fi | |
332 | ||
333 | -debug: $(PROGRAM) ../libsrc/libmfhdf.a | |
334 | +debug: $(PROGRAM) ../libsrc/libmfhdf.la | |
335 | purify $(CC) $(CFLAGS) $(CFLAGS_NETCDF) $(OBJS) $(LIBS) -o phdp | |
336 | ||
337 | ||
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 | |
341 | @@ -157,7 +157,7 @@ | |
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 | |
344 | ||
345 | -LIBOBJS = jackets.o mfsdf.o mfsdff.o | |
346 | +LIBOBJS = jackets.lo mfsdf.lo mfsdff.lo | |
347 | LIBNAME = mfhdf | |
348 | #REMOTE_LIBRARY = ../libsrc/lib$(LIBNAME).a | |
349 | REMOTE_LIBRARY = $(srcdir)/../libsrc/lib$(LIBNAME).a | |
350 | @@ -181,9 +181,9 @@ | |
351 | ||
352 | nall:: FORCE | |
353 | @if test -z "$(FMPOOL_FLAGS)"; then \ | |
354 | - $(MAKE) $(MFLAGS) $(LOCAL_MACROS) netcdf.inc $(REMOTE_LIBRARY); \ | |
355 | + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) netcdf.inc $(LIBOBJS); \ | |
356 | else \ | |
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); \ | |
359 | fi | |
360 | ||
361 | test: FORCE | |
362 | @@ -215,7 +215,7 @@ | |
363 | # | |
364 | ||
365 | .SUFFIXES: | |
366 | -.SUFFIXES: .so .o .i .c .fc .f .F .l .y | |
367 | +.SUFFIXES: .so .o .lo .i .c .fc .f .F .l .y | |
368 | ||
369 | # ########################################################################### | |
370 | # General Macros: (moved to make file fragment ) | |
371 | @@ -275,6 +275,8 @@ | |
372 | # | |
373 | .f.o: | |
374 | $(FC) -c $(FFLAGS) $< | |
375 | +.f.lo: | |
f31ffbfc | 376 | + libtool --mode=compile $(LTTAG) $(FC) -c $(FFLAGS) $< |
2bd7f214 JB |
377 | .F.o: |
378 | ln -s $< $$$$.c \ | |
379 | && $(CPP) -DUD_FORTRAN_SOURCE $(CPPFLAGS) $(CPPFLAGS_NETCDF) $$$$.c \ | |
380 | @@ -303,6 +305,8 @@ | |
381 | # | |
382 | .c.o: | |
383 | $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $< | |
384 | +.c.lo: | |
dbb503af | 385 | + libtool --mode=compile $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $< |
2bd7f214 JB |
386 | |
387 | # Compile lex(1) code. This rule is here to ensure the use of CPPFLAGS. | |
388 | # | |
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 | |
392 | @@ -76,7 +76,7 @@ | |
393 | ||
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 | |
404 | ||
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 | |
412 | LIBRARY = mfhdf | |
413 | DEBUGLIBRARY = mfhdf_g | |
414 | PROFILEDLIBRARY = mfhdf_pg | |
415 | -OBJS = $(PROGRAM).o | |
416 | +OBJS = $(PROGRAM).lo | |
417 | #LD_XDR = @LD_XDR@ | |
418 | -LD_NETCDF = libmfhdf.a | |
419 | +LD_NETCDF = libmfhdf.la | |
420 | LIBS = $(LD_NETCDF) $(LD_XDR) $(HDF_LIB) $(JPEG_LIB) $(LIBSX) $(ZLIB_LIB) | |
421 | prefix = ../../.. | |
422 | ||
423 | @@ -234,7 +235,7 @@ | |
424 | # | |
425 | ||
426 | .SUFFIXES: | |
427 | -.SUFFIXES: .so .o .i .c .fc .f .F .l .y | |
428 | +.SUFFIXES: .so .o .lo .i .c .fc .f .F .l .y | |
429 | ||
430 | # ########################################################################### | |
431 | # General Macros: (moved to make file fragment ) | |
432 | @@ -292,6 +293,8 @@ | |
433 | # | |
434 | .f.o: | |
435 | $(FC) -c $(FFLAGS) $< | |
436 | +.f.lo: | |
f31ffbfc | 437 | + libtool --mode=compile $(LTTAG) $(FC) -c $(FFLAGS) $< |
2bd7f214 JB |
438 | .F.o: |
439 | ln -s $< $$$$.c \ | |
440 | && $(CPP) -DUD_FORTRAN_SOURCE $(CPPFLAGS) $(CPPFLAGS_NETCDF) $$$$.c \ | |
441 | @@ -320,6 +323,8 @@ | |
442 | # | |
443 | .c.o: | |
444 | $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $< | |
445 | +.c.lo: | |
dbb503af | 446 | + libtool --mode=compile $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $< |
2bd7f214 JB |
447 | |
448 | # Compile lex(1) code. This rule is here to ensure the use of CPPFLAGS. | |
449 | # | |
450 | @@ -328,6 +333,11 @@ | |
451 | $(LEX) -t $< > $*.c | |
452 | $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $*.c | |
453 | rm $*.c | |
454 | +.l.lo: | |
455 | + rm -f $*.c | |
456 | + $(LEX) -t $< > $*.c | |
dbb503af | 457 | + libtool --mode=compile $(CC) -c $(CPPFLAGS) $(CPPFLAGS_NETCDF) $(CFLAGS) $(CFLAGS_NETCDF) $*.c |
2bd7f214 JB |
458 | + rm $*.c |
459 | ||
460 | # C preprocess. | |
461 | # NB: | |
462 | @@ -343,7 +353,7 @@ | |
463 | # ########################################################################### | |
464 | # RANLIB = @RANLIB@ | |
465 | LIBDIR = $(prefix)/lib | |
466 | -LIB_A = lib$(LIBRARY).a | |
467 | +LIB_A = lib$(LIBRARY).la | |
468 | ||
469 | library:: $(LIB_A) | |
470 | ||
471 | @@ -351,9 +361,7 @@ | |
472 | # makefile in another directory prior to the execution of the following rule. | |
473 | # | |
474 | $(LIB_A): $(LIBOBJS) FORCE | |
475 | - $(AR) rcuv $@ $(LIBOBJS) | |
476 | - $(RANLIB) $@ | |
477 | -# $(LD) -b -o libmfhdf.sl $(LIBOBJS) | |
09440d7a | 478 | + libtool --mode=link $(CC) -o $(LIB_A) $(LIBOBJS) ../../hdf/src/libdf.la -lz -ljpeg -lm -rpath $(LIBDIR) |
2bd7f214 JB |
479 | |
480 | # The following rule is for those makefiles needing to install object | |
481 | # modules in a library in another directory. They need only define | |
482 | @@ -387,7 +395,7 @@ | |
483 | installed_libfile: $(LIBDIR)/$(LIBFILE) | |
484 | ||
485 | $(LIBDIR)/$(LIBFILE): $(LIBDIR) $(LIBFILE) | |
486 | - $(INSTALL_DATA) $(LIBFILE) $@ | |
dbb503af | 487 | + libtool --mode=install $(INSTALL_DATA) $(LIBFILE) $@ |
2bd7f214 JB |
488 | |
489 | dummy_libdir $(LIBDIR): | |
490 | mkdir -p $@ | |
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 | |
494 | @@ -76,7 +76,7 @@ | |
495 | ||
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 | |
503 | @@ -128,7 +128,7 @@ | |
504 | LD_NETCDF = ../libsrc/libmfhdf.a | |
505 | OBJS = ncdump.o vardata.o dumplib.o | |
506 | #LD_XDR = @LD_XDR@ | |
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) | |
510 | prefix = ../../.. | |
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 | |
515 | @@ -76,7 +76,7 @@ | |
516 | ||
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 | |
524 | @@ -131,7 +131,7 @@ | |
525 | test.com test0.cdl \ | |
526 | $(vms_stuff) | |
527 | LIBNAME = mfhdf | |
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 | |
532 | #LD_XDR = @LD_XDR@ | |
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 | |
536 | @@ -76,7 +76,7 @@ | |
537 | ||
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 | |
545 | @@ -123,7 +123,7 @@ | |
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 | |
548 | LIBNAME = mfhdf | |
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 "===========================" | |
556 | ./$(PROGRAM) | |
557 | ||
558 | -$(PROGRAM): ../libsrc/libmfhdf.a | |
559 | +$(PROGRAM): ../libsrc/libmfhdf.la | |
560 | ||
561 | install:: | |
562 | ||
563 | nctime: nctime.o | |
564 | $(CC) $(CFLAGS) $(CFLAGS_NETCDF) nctime.o $(LIBS) -o $@ | |
565 | ||
566 | -debug: ../libsrc/libmfhdf.a | |
567 | +debug: ../libsrc/libmfhdf.la | |
568 | purify $(CC) $(CFLAGS) $(CFLAGS_NETCDF) $(OBJS) $(LIBS) -o pnctest | |
569 | ||
570 | -perfs: ../libsrc/libmfhdf.a | |
571 | +perfs: ../libsrc/libmfhdf.la | |
572 | quantify $(CC) $(CFLAGS) $(CFLAGS_NETCDF) $(OBJS) $(LIBS) -o qnctest | |
573 | ||
574 | saber_src: |