1 diff -Nur HDF4.1r4.orig/Makefile.in HDF4.1r4/Makefile.in
2 --- HDF4.1r4.orig/Makefile.in Sun Jun 20 03:40:35 1999
3 +++ HDF4.1r4/Makefile.in Sun Mar 25 15:56:20 2001
5 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
6 SUBDIRS="$(HDFDIR)" subd
9 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
10 - SUBDIRS="$(HDFDIR)" subd
13 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
14 - SUBDIRS="$(HDFDIR)" subd
17 @$(MAKE) $(MFLAGS) $(NETCDF_FLAGS) TARG=$@ \
18 SUBDIRS="$(NETCDFDIR)" subdn
20 @echo "make libs - makes HDF, IJG JPEG and mfhdf libraries only"
21 @echo "make hdf-libs - makes HDF and IJG JPEG libraries only"
22 @echo "make libdf - makes HDF library"
23 - @echo "make libjpeg - makes IJG JPEG library"
24 - @echo "make libz - makes GZIP deflate library"
25 @echo "make libmfhdf - makes mfhdf library"
26 @echo "make test - run both HDF and NETCDF tests"
27 @echo "make test-mfhdf - run NETCDF tests"
28 diff -Nur HDF4.1r4.orig/hdf/Makefile.in HDF4.1r4/hdf/Makefile.in
29 --- HDF4.1r4.orig/hdf/Makefile.in Wed Mar 4 21:31:55 1998
30 +++ HDF4.1r4/hdf/Makefile.in Sun Mar 25 15:47:35 2001
32 MANIFEST = $(DISTFILES)
33 DISTFILES = Makefile.in COPYING build.inc
35 -SUBDIRS= src jpeg zlib fmpool pablo test util
36 +SUBDIRS= src fmpool pablo test util
44 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
46 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
48 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
49 SUBDIRS="src pablo fmpool util test" subd
52 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
54 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
56 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=nofortran \
57 SUBDIRS="src pablo fmpool util test" subd
59 rebuild rebuildnofortran:
60 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
62 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
64 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
65 SUBDIRS="src pablo fmpool util test" subd
68 - @$(MAKE) $(MYFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
70 - @$(MAKE) $(MYFLAGS) $(HDF_FLAGS) TARG=libz.a \
72 @$(MAKE) $(MYFLAGS) $(HDF_FLAGS) TARG=nofortran \
73 SUBDIRS="src pablo fmpool" subd
76 allnostub: allnofortran
79 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
81 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
83 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=all \
84 SUBDIRS="src pablo fmpool" subd
87 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=all \
91 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
95 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
99 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
100 - SUBDIRS="jpeg" subd
101 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
102 - SUBDIRS="zlib" subd
103 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=all \
104 SUBDIRS="src pablo fmpool util" subd
107 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
108 - SUBDIRS="jpeg" subd
109 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
110 - SUBDIRS="zlib" subd
111 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=all \
112 SUBDIRS="src pablo fmpool test" subd
115 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
116 - SUBDIRS="jpeg" subd
117 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
118 - SUBDIRS="zlib" subd
119 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=nofortran \
120 SUBDIRS="src pablo fmpool test" subd
123 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
124 - SUBDIRS="jpeg" subd
125 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
126 - SUBDIRS="zlib" subd
127 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=nofortran \
128 SUBDIRS="src pablo fmpool test" subd
130 @@ -226,27 +182,23 @@
133 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=install-lib \
134 - SUBDIRS="src jpeg zlib pablo fmpool" subd
135 + SUBDIRS="src pablo fmpool" subd
136 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=install \
140 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=install-lib \
141 - SUBDIRS="src jpeg zlib pablo fmpool" subd
142 + SUBDIRS="src pablo fmpool" subd
145 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=install-includes \
146 - SUBDIRS="src jpeg zlib pablo fmpool" subd
147 + SUBDIRS="src pablo fmpool" subd
150 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=install \
154 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
155 - SUBDIRS="jpeg" subd
156 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
157 - SUBDIRS="zlib" subd
158 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=all \
159 SUBDIRS="src perf fmpool" subd
161 @@ -255,25 +207,21 @@
162 # SUBDIRS="src util test" subd
165 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libjpeg.a \
166 - SUBDIRS="jpeg" subd
167 - @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=libz.a \
168 - SUBDIRS="zlib" subd
169 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=debug \
170 SUBDIRS="src fmpool test" subd
173 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=saber \
174 - SUBDIRS="src jpeg zlib test" subd
175 + SUBDIRS="src test" subd
178 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
179 - SUBDIRS="src jpeg zlib pablo fmpool util test" subd
180 + SUBDIRS="src pablo fmpool util test" subd
181 -$(RM) $(RMFLAGS) core *.log
184 @$(MAKE) $(MFLAGS) $(HDF_FLAGS) TARG=$@ \
185 - SUBDIRS="src jpeg zlib pablo fmpool util test" subd
186 + SUBDIRS="src pablo fmpool util test" subd
187 -$(RM) $(RMFLAGS) core *.log
188 -$(RM) -rf bin lib include config.status Makefile
191 @echo "make utilities - makes HDF library and utilities"
192 @echo "make libs - makes HDF and IJG JPEG libraries only"
193 @echo "make libdf - makes HDF library "
194 - @echo "make libjpeg - makes IJG JPEG library "
195 - @echo "make libz - makes GZIP deflate library "
196 @echo "make test-hdf - run HDF library tests "
197 @echo "make test-hdfnofortran - run HDF library tests except the fortran test "
198 @echo "make test-hdffortran - run HDF library fortran tests only "
199 diff -Nur HDF4.1r4.orig/hdf/pablo/Makefile.in HDF4.1r4/hdf/pablo/Makefile.in
200 --- HDF4.1r4.orig/hdf/pablo/Makefile.in Tue Aug 22 20:47:01 2000
201 +++ HDF4.1r4/hdf/pablo/Makefile.in Sun Mar 25 15:50:07 2001
202 @@ -136,16 +136,16 @@
203 HDFSRC= $(srcdir)/../src
205 # ==> specify where to find the JPEG include files and library
206 -JPEGINC=$(srcdir)/../jpeg
207 -JPEGLIB=$(srcdir)/../jpeg
208 +JPEGINC=/usr/include
211 # ==> specify where to find the FMPOOL include and source files
212 FMPOOL_INC=$(srcdir)/../fmpool
213 FMPOOL_SRC=$(srcdir)/../fmpool
215 # ==> specify where to find the gzip zlib include files and library
216 -ZLIBINC=$(srcdir)/../zlib
217 -ZLIBLIB=$(srcdir)/../zlib
218 +ZLIBINC=/usr/include
221 ALL_CFLAGS= $(CFLAGS) $(PABLO_FLAGS) $(FMPOOL_FLAGS) -I. $(PABLO_INCLUDE) -I$(HDFINC) -I$(JPEGINC) -I$(ZLIBINC) -I$(FMPOOL_INC)
223 diff -Nur HDF4.1r4.orig/hdf/src/Makefile.in HDF4.1r4/hdf/src/Makefile.in
224 --- HDF4.1r4.orig/hdf/src/Makefile.in Tue Aug 29 13:04:27 2000
225 +++ HDF4.1r4/hdf/src/Makefile.in Sun Mar 25 15:51:28 2001
227 HDFBIN= $(srcdir)/../bin
229 # ==> specify where to find the JPEG include files and library
230 -JPEGINC=$(srcdir)/../jpeg
231 -JPEGLIB=$(srcdir)/../jpeg
232 +JPEGINC=/usr/include
235 # ==> specify where to find the Pablo include and source files
236 PABLO_HINC=$(srcdir)/../pablo
238 FMPOOL_SRC=$(srcdir)/../fmpool
240 # ==> specify where to find the gzip zlib include files and library
241 -ZLIBINC=$(srcdir)/../zlib
242 -ZLIBLIB=$(srcdir)/../zlib
243 +ZLIBINC=/usr/include
246 ALL_CFLAGS = -I. $(CFLAGS) $(FMPOOL_FLAGS) -I$(JPEGINC) -I$(ZLIBINC)
248 diff -Nur HDF4.1r4.orig/hdf/test/Makefile.in HDF4.1r4/hdf/test/Makefile.in
249 --- HDF4.1r4.orig/hdf/test/Makefile.in Wed Jan 13 20:19:37 1999
250 +++ HDF4.1r4/hdf/test/Makefile.in Sun Mar 25 15:53:46 2001
252 HDFBIN=$(srcdir)/../bin
254 # ==> where is your JPEG library (libjpeg.a) located?
255 -JPEGLIB=$(srcdir)/../jpeg
256 -JPEGINC=$(srcdir)/../jpeg
258 +JPEGINC=/usr/include
260 # ==> where is your PABLO include files
261 PABLO_HINC= $(srcdir)/../pablo
263 FMPOOL_SRC=$(srcdir)/../fmpool
265 # ==> where is your zlib library (libzlib.a) located?
266 -ZLIBLIB=$(srcdir)/../zlib
267 -ZLIBINC=$(srcdir)/../zlib
269 +ZLIBINC=/usr/include
271 ALL_CFLAGS = $(CFLAGS) $(FMPOOL_FLAGS) -I$(HDFINC) -I$(JPEGINC) -I$(ZLIBINC)
274 # cd $(HDFLIB); echo Making \`$(TARG)\' in `pwd`; \
275 # $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG);
277 -$(JPEGLIB)/libjpeg.a:
278 -# cd $(JPEGLIB); echo Making \`$(TARG)\' in `pwd`; \
279 -# $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG);
282 -# cd $(JPEGLIB); echo Making \`$(TARG)\' in `pwd`; \
283 -# $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG);
286 # $(CC) $(CFLAGS) -c -I$(HDFINC) $*.c
290 $(FOBJS): fortest.inc
292 -#$(FTESTS): $(FOBJS) $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
293 -# $(FC) $(FFLAGS) $@.o -o $@ $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
294 +#$(FTESTS): $(FOBJS) $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDFLIB)/libdf.a
295 +# $(FC) $(FFLAGS) $@.o -o $@ $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDFLIB)/libdf.a
299 @@ -360,26 +352,26 @@
300 @cmp fortest.out fortest.sav && echo "*** Fortran tests passed ***";
302 qtesthdf: $(COBJS) $(HDFLIB)/libdf.a
303 - quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
304 + quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a -ljpeg -lz -lm
306 ptesthdf: $(COBJS) $(HDFLIB)/libdf.a
307 - purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
308 + purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a -ljpeg -lz -lm
310 testhdf.tc: $(COBJS) $(HDFLIB)/libdf.a
311 - proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
312 + proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a -ljpeg -lz -lm
314 testhdf: $(COBJS) $(HDFLIB)/libdf.a
315 - $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
316 + $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a -ljpeg -lz -lm
317 test -d $(TESTDIR) || mkdir $(TESTDIR)
319 fortestF: $(FOBJS) $(HDFLIB)/libdf.a
320 - $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
321 + $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a -ljpeg -lz -lm
323 fortest: $(HDFLIB)/libdf.a fortest.c $(CHDRS)
324 - $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
325 + $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a -ljpeg -lz -lm
327 gentest: gentest.c $(HDFLIB)/libdf.a
328 - $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm
329 + $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a -ljpeg -lz -lm
333 diff -Nur HDF4.1r4.orig/hdf/util/Makefile.in HDF4.1r4/hdf/util/Makefile.in
334 --- HDF4.1r4.orig/hdf/util/Makefile.in Mon Jun 26 21:51:31 2000
335 +++ HDF4.1r4/hdf/util/Makefile.in Sun Mar 25 15:55:27 2001
337 HDFBIN=$(srcdir)/../bin
339 # ==> where is your JPEG library (libjpeg.a) located?
340 -JPEGLIB=$(srcdir)/../jpeg
341 -JPEGINC=$(srcdir)/../jpeg
343 +JPEGINC=/usr/include
345 # ==> where is your PABLO include files
346 PABLO_HINC= $(srcdir)/../pablo
348 FMPOOL_SRC=$(srcdir)/../fmpool
350 # ==> where is your zlib library (libz.a) located?
351 -ZLIBLIB=$(srcdir)/../zlib
352 -ZLIBINC=$(srcdir)/../zlib
354 +ZLIBINC=/usr/include
356 #Where are the utility includes
358 @@ -221,29 +221,25 @@
359 $(CC) $(ALL_CFLAGS) -c $<
361 .c: $(HDFLIB)/libdf.a
362 - $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a $(LIBSX)
363 + $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a -ljpeg -lz $(LIBSX)
365 .f: $(HDFLIB)/libdf.a
366 - $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
367 + $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ -ljpeg -lz
369 hdfed: he.h he_proto.h $(HEOBJ) $(HDFLIB)/libdf.a $(FRC)
370 - $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
371 + $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed -ljpeg -lz
373 gif2hdf: gif.h $(GHOBJ) $(HDFLIB)/libdf.a $(FRC)
374 - $(CC) $(ALL_CFLAGS) $(GHOBJ) $(HDFLIB)/libdf.a -o gif2hdf $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
375 + $(CC) $(ALL_CFLAGS) $(GHOBJ) $(HDFLIB)/libdf.a -o gif2hdf -ljpeg -lz
377 hdf2gif: gif.h $(HGOBJ) $(HDFLIB)/libdf.a $(FRC)
378 - $(CC) $(ALL_CFLAGS) $(HGOBJ) $(HDFLIB)/libdf.a -o hdf2gif $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
379 + $(CC) $(ALL_CFLAGS) $(HGOBJ) $(HDFLIB)/libdf.a -o hdf2gif -ljpeg -lz
381 utils: $(UTILS) $(HDFLIB)/libdf.a $(FRC)
387 -$(JPEGLIB)/libjpeg.a:
392 -$(RM) $(RMFLAGS) *.o $(UTILS) hdfed fptest
393 diff -Nur HDF4.1r4.orig/mfhdf/dumper/Makefile.in HDF4.1r4/mfhdf/dumper/Makefile.in
394 --- HDF4.1r4.orig/mfhdf/dumper/Makefile.in Wed Aug 30 22:32:44 2000
395 +++ HDF4.1r4/mfhdf/dumper/Makefile.in Sun Mar 25 16:02:46 2001
397 HDF_INC = $(TOP_SRCDIR)/hdf/src/
398 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
399 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
400 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
401 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
404 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
405 PORT_INC = $(TOP_SRCDIR)/mfhdf/port
407 diff -Nur HDF4.1r4.orig/mfhdf/fortran/Makefile.in HDF4.1r4/mfhdf/fortran/Makefile.in
408 --- HDF4.1r4.orig/mfhdf/fortran/Makefile.in Wed Aug 30 23:55:39 2000
409 +++ HDF4.1r4/mfhdf/fortran/Makefile.in Sun Mar 25 16:03:23 2001
411 HDF_INC = $(TOP_SRCDIR)/hdf/src/
412 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
413 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
414 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
415 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
418 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
419 PORT_INC = $(TOP_SRCDIR)/mfhdf/port
421 diff -Nur HDF4.1r4.orig/mfhdf/libsrc/Makefile.in HDF4.1r4/mfhdf/libsrc/Makefile.in
422 --- HDF4.1r4.orig/mfhdf/libsrc/Makefile.in Wed Aug 30 23:55:46 2000
423 +++ HDF4.1r4/mfhdf/libsrc/Makefile.in Sun Mar 25 16:03:55 2001
425 HDF_INC = $(TOP_SRCDIR)/hdf/src/
426 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
427 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
428 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
429 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
432 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
433 PORT_INC = $(TOP_SRCDIR)/mfhdf/port
435 diff -Nur HDF4.1r4.orig/mfhdf/ncdump/Makefile.in HDF4.1r4/mfhdf/ncdump/Makefile.in
436 --- HDF4.1r4.orig/mfhdf/ncdump/Makefile.in Wed Aug 30 20:43:28 2000
437 +++ HDF4.1r4/mfhdf/ncdump/Makefile.in Sun Mar 25 16:04:21 2001
439 HDF_INC = $(TOP_SRCDIR)/hdf/src/
440 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
441 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
442 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
443 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
446 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
447 PORT_INC = $(TOP_SRCDIR)/mfhdf/port
449 diff -Nur HDF4.1r4.orig/mfhdf/ncgen/Makefile.in HDF4.1r4/mfhdf/ncgen/Makefile.in
450 --- HDF4.1r4.orig/mfhdf/ncgen/Makefile.in Wed Aug 30 20:43:30 2000
451 +++ HDF4.1r4/mfhdf/ncgen/Makefile.in Sun Mar 25 16:06:19 2001
453 HDF_INC = $(TOP_SRCDIR)/hdf/src/
454 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
455 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
456 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
457 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
460 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
461 PORT_INC = $(TOP_SRCDIR)/mfhdf/port
472 diff -Nur HDF4.1r4.orig/mfhdf/nctest/Makefile.in HDF4.1r4/mfhdf/nctest/Makefile.in
473 --- HDF4.1r4.orig/mfhdf/nctest/Makefile.in Wed Aug 30 02:11:23 2000
474 +++ HDF4.1r4/mfhdf/nctest/Makefile.in Sun Mar 25 16:06:34 2001
476 HDF_INC = $(TOP_SRCDIR)/hdf/src/
477 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
478 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
479 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
480 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
483 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
484 PORT_INC = $(TOP_SRCDIR)/mfhdf/port
486 diff -Nur HDF4.1r4.orig/mfhdf/xdr/Makefile.in HDF4.1r4/mfhdf/xdr/Makefile.in
487 --- HDF4.1r4.orig/mfhdf/xdr/Makefile.in Wed Aug 30 23:55:50 2000
488 +++ HDF4.1r4/mfhdf/xdr/Makefile.in Sun Mar 25 16:07:13 2001
490 HDF_INC = $(TOP_SRCDIR)/hdf/src/
491 PABLO_HINC = $(TOP_SRCDIR)/hdf/pablo
492 FMPOOL_INC = $(TOP_SRCDIR)/hdf/fmpool
493 -JPEG_LIB = $(TOP_SRCDIR)/hdf/jpeg/libjpeg.a
494 -ZLIB_LIB = $(TOP_SRCDIR)/hdf/zlib/libz.a
497 NETCDF_INC = $(TOP_SRCDIR)/mfhdf/libsrc
498 PORT_INC = $(TOP_SRCDIR)/mfhdf/port