--- ./hdf/src/Makefile.in Tue Nov 25 15:40:14 1997 +++ ../HDF4.1r3/./hdf/src/Makefile.in Tue May 2 13:50:48 2000 @@ -130,6 +130,11 @@ # ############# End of system configuration section. ############### HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ FC="$(FC)" \ @@ -145,6 +150,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" --- ./hdf/pablo/Makefile.in Thu Mar 18 16:02:50 1999 +++ ../HDF4.1r3/./hdf/pablo/Makefile.in Tue May 2 13:51:25 2000 @@ -108,6 +108,11 @@ # ############# End of system configuration section. ############### HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ FC="$(FC)" \ @@ -124,6 +129,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" --- ./hdf/test/Makefile.in Wed Jan 13 14:19:37 1999 +++ ../HDF4.1r3/./hdf/test/Makefile.in Tue May 2 13:56:27 2000 @@ -192,6 +192,11 @@ # ############# End of system configuration section. ############### HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ FC="$(FC)" \ @@ -207,6 +212,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -217,10 +227,12 @@ HDFLIB=$(srcdir)/../src HDFSRC=$(srcdir)/../src HDFBIN=$(srcdir)/../bin +HDF_LIB=$(HDFLIB)/libdf.a # ==> where is your JPEG library (libjpeg.a) located? JPEGLIB=$(srcdir)/../jpeg JPEGINC=$(srcdir)/../jpeg +JPEG_LIB=$(JPEGLIB)/libjpeg.a # ==> where is your PABLO include files PABLO_HINC= $(srcdir)/../pablo @@ -232,6 +244,7 @@ # ==> where is your zlib library (libzlib.a) located? ZLIBLIB=$(srcdir)/../zlib ZLIBINC=$(srcdir)/../zlib +ZLIB_LIB=$(XLIBLIB)/libz.a ALL_CFLAGS = $(CFLAGS) $(FMPOOL_FLAGS) -I$(HDFINC) -I$(JPEGINC) -I$(ZLIBINC) @@ -307,15 +320,15 @@ debug: ptesthdf $(HDFLIB)/libdf.a: -# cd $(HDFLIB); echo Making \`$(TARG)\' in `pwd`; \ +# cd $(HDFLIB); echo Making \`$(TARG)\' in `pwd`; \ # $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG); $(JPEGLIB)/libjpeg.a: -# cd $(JPEGLIB); echo Making \`$(TARG)\' in `pwd`; \ +# cd $(JPEGLIB); echo Making \`$(TARG)\' in `pwd`; \ # $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG); $(ZLIBLIB)/libz.a: -# cd $(JPEGLIB); echo Making \`$(TARG)\' in `pwd`; \ +# cd $(JPEGLIB); echo Making \`$(TARG)\' in `pwd`; \ # $(MAKE) $(MFLAGS) $(HDF_FLAGS) $(TARG); #.c.o: @@ -331,8 +344,8 @@ $(FOBJS): fortest.inc -#$(FTESTS): $(FOBJS) $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -# $(FC) $(FFLAGS) $@.o -o $@ $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a +#$(FTESTS): $(FOBJS) $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDF_LIB) $(JPEG_LIB) $(ZLIB_LIB) +# $(FC) $(FFLAGS) $@.o -o $@ $(CFORSUPOBJS) $(FFORSUPOBJS) $(HDF_LIB) $(JPEG_LIB) $(ZLIB_LIB) #$(FTESTS): $(FRC) @@ -360,26 +373,26 @@ @cmp fortest.out fortest.sav && echo "*** Fortran tests passed ***"; qtesthdf: $(COBJS) $(HDFLIB)/libdf.a - quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm ptesthdf: $(COBJS) $(HDFLIB)/libdf.a - purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm testhdf.tc: $(COBJS) $(HDFLIB)/libdf.a - proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm testhdf: $(COBJS) $(HDFLIB)/libdf.a - $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm test -d $(TESTDIR) || mkdir $(TESTDIR) fortestF: $(FOBJS) $(HDFLIB)/libdf.a - $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm fortest: $(HDFLIB)/libdf.a fortest.c $(CHDRS) - $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm gentest: gentest.c $(HDFLIB)/libdf.a - $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm + $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) -lm ftests: $(FTESTS) --- ./hdf/util/Makefile.in Thu Feb 18 15:07:39 1999 +++ ../HDF4.1r3/./hdf/util/Makefile.in Tue May 2 13:58:28 2000 @@ -94,6 +94,11 @@ # ############# End of system configuration section. ############### HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ FC="$(FC)" \ @@ -109,6 +114,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -119,10 +129,12 @@ HDFLIB=$(srcdir)/../src HDFSRC=$(srcdir)/../src HDFBIN=$(srcdir)/../bin +HDF_LIB=$(HDFLIB)/libdf.a # ==> where is your JPEG library (libjpeg.a) located? JPEGLIB=$(srcdir)/../jpeg JPEGINC=$(srcdir)/../jpeg +JPEG_LIB=$(JPEGLIB)/libjpeg.a # ==> where is your PABLO include files PABLO_HINC= $(srcdir)/../pablo @@ -134,6 +146,7 @@ # ==> where is your zlib library (libz.a) located? ZLIBLIB=$(srcdir)/../zlib ZLIBINC=$(srcdir)/../zlib +ZLIB_LIB=$(ZLIBLIB)/libz.a #Where are the utility includes UTILINC=$(srcdir) @@ -216,13 +229,13 @@ $(CC) $(ALL_CFLAGS) -c $< .c: $(HDFLIB)/libdf.a - $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a $(LIBSX) + $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEG_LIB) $(ZLIB_LIB) $(LIBSX) .f: $(HDFLIB)/libdf.a - $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a + $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEG_LIB) $(ZLIB_LIB) hdfed: he.h he_proto.h $(HEOBJ) $(HDFLIB)/libdf.a $(FRC) - $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a + $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEG_LIB) $(ZLIB_LIB) utils: $(UTILS) $(HDFLIB)/libdf.a $(FRC) --- ./hdf/Makefile.in Wed Mar 4 15:31:55 1998 +++ ../HDF4.1r3/./hdf/Makefile.in Tue May 2 13:58:59 2000 @@ -93,6 +93,11 @@ # HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ FC="$(FC)" \ @@ -111,6 +116,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ FFLAGS="$(FFLAGS)" \ --- ./hdf/fmpool/Makefile.in Tue Nov 25 15:39:54 1997 +++ ../HDF4.1r3/./hdf/fmpool/Makefile.in Tue May 2 13:59:25 2000 @@ -122,6 +122,11 @@ CL= ${CC} $(CFLAGS) -c -D__FMPINTERFACE_PRIVATE ${AUXFLAGS} -I. HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ FC="$(FC)" \ @@ -137,6 +142,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" --- ./Makefile.in Tue Nov 25 15:39:29 1997 +++ ../HDF4.1r3/./Makefile.in Tue May 2 14:00:21 2000 @@ -114,6 +114,11 @@ # HDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ ACDEFS="$(ACDEFS)" \ @@ -133,6 +138,11 @@ NETCDF_FLAGS = \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ ACDEFS="$(ACDEFS)" \ @@ -152,6 +162,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ FFLAGS="$(FFLAGS)" \ --- ./mfhdf/doc/Makefile.in Tue Mar 3 17:13:01 1998 +++ ../HDF4.1r3/./mfhdf/doc/Makefile.in Tue May 2 14:02:41 2000 @@ -156,6 +156,11 @@ # ########################################################################### SUBDIR_MACROS = CC="$(CC)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -164,6 +169,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -303,13 +313,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MARCOS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -332,7 +342,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/xdr/Makefile.in Wed Mar 4 16:39:46 1998 +++ ../HDF4.1r3/./mfhdf/xdr/Makefile.in Tue May 2 14:03:52 2000 @@ -199,6 +199,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -207,6 +212,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -346,13 +356,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -375,7 +385,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/port/Makefile.in Fri Dec 13 14:38:22 1996 +++ ../HDF4.1r3/./mfhdf/port/Makefile.in Tue May 2 14:04:38 2000 @@ -229,6 +229,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -237,6 +242,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -376,13 +386,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -405,7 +415,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/Makefile.in Wed Sep 2 17:09:58 1998 +++ ../HDF4.1r3/./mfhdf/Makefile.in Tue May 2 14:06:25 2000 @@ -170,6 +170,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ FC="$(FC)" \ FFLAGS="$(FFLAGS)" @@ -177,6 +182,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ FC="$(FC)" \ FFLAGS="$(FFLAGS)" @@ -315,13 +325,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -344,7 +354,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) @@ -708,7 +718,7 @@ for subdir in $(SUBDIRS); do \ echo making $@ in $$subdir; \ mkdir $(distdir)/$$subdir || exit 1; \ - (cd $$subdir && $(MAKE) $@) || exit 1; \ + (cd $$subdir && $(MAKE) $(MFLAGS) $(SUBDIR_MACROS) $@) || exit 1; \ done # ########################################################################### --- ./mfhdf/fortran/Makefile.in Wed Mar 4 16:39:35 1998 +++ ../HDF4.1r3/./mfhdf/fortran/Makefile.in Tue May 2 14:07:13 2000 @@ -234,6 +234,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ FFLAGS="$(FFLAGS)" \ @@ -243,6 +248,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ FFLAGS="$(FFLAGS)" \ @@ -385,13 +395,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -414,7 +424,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/ncdump/Makefile.in Fri Jan 24 19:42:36 1997 +++ ../HDF4.1r3/./mfhdf/ncdump/Makefile.in Tue May 2 14:07:57 2000 @@ -178,6 +178,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -186,6 +191,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -325,13 +335,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -354,7 +364,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/nctest/Makefile.in Wed Mar 4 16:39:43 1998 +++ ../HDF4.1r3/./mfhdf/nctest/Makefile.in Tue May 2 14:08:38 2000 @@ -181,6 +181,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -189,6 +194,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -328,13 +338,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -357,7 +367,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/dumper/Makefile.in Mon Feb 10 12:04:32 1997 +++ ../HDF4.1r3/./mfhdf/dumper/Makefile.in Tue May 2 14:09:38 2000 @@ -173,6 +173,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -181,6 +186,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -320,13 +330,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -349,7 +359,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/libsrc/Makefile.in Wed Mar 4 16:39:39 1998 +++ ../HDF4.1r3/./mfhdf/libsrc/Makefile.in Tue May 2 14:11:30 2000 @@ -220,11 +220,11 @@ fi debug: # rm -f $(COBJS) - $(MAKE) $(MFLAGS) "CFLAGS=-g $(CFLAGS_NETCDF) " "LIBRARY=$(LIBRARY)_g" library + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) "CFLAGS=-g $(CFLAGS_NETCDF) " "LIBRARY=$(LIBRARY)_g" library profiled: # rm -f $(COBJS) - $(MAKE) $(MFLAGS) "CFLAGS=-pg $(CFLAGS_NETCDF) " "LIBRARY=$(LIBRARY)_pg" library + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) "CFLAGS=-pg $(CFLAGS_NETCDF) " "LIBRARY=$(LIBRARY)_pg" library cdftest.oc: $(CSRCS) cdftest.c #load -C $(CPPFLAGS) $(CPPFLAGS_NETCDF) -I/usr/local/lang/SC1.0/ansi_include \ @@ -253,6 +253,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -261,6 +266,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -401,13 +411,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -430,7 +440,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO) --- ./mfhdf/ncgen/Makefile.in Fri Jan 24 19:42:41 1997 +++ ../HDF4.1r3/./mfhdf/ncgen/Makefile.in Tue May 2 14:12:21 2000 @@ -197,7 +197,7 @@ NONE*) \ echo 1>&2 "\`$@' not made because no FORTRAN compiler";; \ *) \ - $(MAKE) $(MFLAGS) ftest0; \ + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) ftest0; \ ./ftest0 ; \ $(NCDUMP) -n test1 ftest0.nc > ftest1.cdl; \ if $(DIFF) $(DIFF_FLAGS) test1.cdl ftest1.cdl; then \ @@ -213,7 +213,7 @@ NONE*) \ echo 1>&2 "\`$@' not made because no FORTRAN compiler";; \ *) \ - $(MAKE) $(MFLAGS) netcdf.inc; \ + $(MAKE) $(MFLAGS) $(LOCAL_MACROS) netcdf.inc; \ ./$(PROGRAM) -f -o ftest0.nc test0.cdl > test0.f; \ $(FC) $(FFLAGS) -o $@ test0.f $(LIBS);; \ esac @@ -255,6 +255,11 @@ SUBDIR_MACROS = CC="$(CC)" \ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -263,6 +268,11 @@ CFLAGS="$(CFLAGS)" \ CPP="$(CPP)" \ CPPFLAGS="$(CPPFLAGS)" \ + ZLIBINC="$(ZLIBINC)" \ + ZLIB_LIB="$(ZLIB_LIB)" \ + JPEGINC="$(JPEGINC)" \ + JPEG_LIB="$(JPEG_LIB)" \ + HDF_LIB="$(HDF_LIB)" \ exec_prefix="$(exec_prefix)" \ FC="$(FC)" \ prefix="$(prefix)" @@ -402,13 +412,13 @@ # if [ -z "$$so_objs" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SO) \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SO) \ # SO_OBJS="$$so_objs"; \ # fi # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIB_SA); \ # fi $(LIB_SO): $(SO_OBJS) @@ -431,7 +441,7 @@ # @if [ -z "$(SA_OBJS)" ]; then \ # :; \ # else \ -# $(MAKE) $(MFLAGS) $(LIBDIR)/$(LIB_SA); \ +# $(MAKE) $(MFLAGS) $(LOCAL_MACROS) $(LIBDIR)/$(LIB_SA); \ # fi $(LIBDIR)/$(LIB_SO): $(LIBDIR) $(LIB_SO)