[packages/hdf.git] / hdf-shared.patch

--- HDF4.2r3/hdf/src/Makefile.am.orig	2006-12-06 21:51:13.000000000 +0100
+++ HDF4.2r3/hdf/src/Makefile.am	2008-06-04 19:39:45.388885271 +0200
@@ -2,7 +2,7 @@
 ##                          Library to build                               ##
 #############################################################################
 
-lib_LIBRARIES = libdf.a
+lib_LTLIBRARIES = libdf.la
 
 FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c    \
            dfr8ff.f dfsdf.c dfsdff.f dfufp2iff.f dfutilf.c herrf.c hfilef.c  \
@@ -27,10 +27,10 @@
 FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
 
 if HDF_BUILD_FORTRAN
-libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
+libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
 include_HEADERS = $(CHEADERS) hproto_fortran.h $(FHEADERS)
 else
-libdf_a_SOURCES = $(CSOURCES)
+libdf_la_SOURCES = $(CSOURCES)
 include_HEADERS = $(CHEADERS)
 endif
 
--- HDF4.2r3/hdf/test/Makefile.am.orig	2007-12-13 08:39:20.000000000 +0100
+++ HDF4.2r3/hdf/test/Makefile.am	2008-06-04 19:40:41.856099802 +0200
@@ -21,23 +21,23 @@
                   mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c  \
                   tdupimgs.c testhdf.c tree.c tszip.c tvattr.c tvset.c      \
 		  tvsfpack.c vers.c
-testhdf_LDADD = ../src/libdf.a
-testhdf_DEPENDENCIES = testdir ../src/libdf.a 
+testhdf_LDADD = ../src/libdf.la
+testhdf_DEPENDENCIES = testdir ../src/libdf.la
 
-buffer_LDADD = ../src/libdf.a
-buffer_DEPENDENCIES = ../src/libdf.a
+buffer_LDADD = ../src/libdf.la
+buffer_DEPENDENCIES = ../src/libdf.la
 
 if HDF_BUILD_FORTRAN
 fortest_SOURCES = fortest.c
-fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
-fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
+fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
+fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
 
 fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f   \
                    t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f          \
                    tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f        \
                    tvattrf.f tvsetf.f
-fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
-fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
+fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
+fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
 endif
 
 testdir:
--- HDF4.2r0/hdf/util/Makefile.am.orig	2003-11-07 19:38:46.000000000 +0100
+++ HDF4.2r0/hdf/util/Makefile.am	2004-03-06 13:04:38.110448752 +0100
@@ -20,76 +20,76 @@
 endif
 
 gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c
-gif2hdf_LDADD = ../src/libdf.a
-gif2hdf_DEPENDENCIES = ../src/libdf.a
+gif2hdf_LDADD = ../src/libdf.la
+gif2hdf_DEPENDENCIES = ../src/libdf.la
 
 hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c
-hdf2gif_LDADD = ../src/libdf.a
-hdf2gif_DEPENDENCIES = ../src/libdf.a
+hdf2gif_LDADD = ../src/libdf.la
+hdf2gif_DEPENDENCIES = ../src/libdf.la
 
 hdf2jpeg_SOURCES = hdf2jpeg.c
-hdf2jpeg_LDADD = ../src/libdf.a
-hdf2jpeg_DEPENDENCIES = ../src/libdf.a
+hdf2jpeg_LDADD = ../src/libdf.la
+hdf2jpeg_DEPENDENCIES = ../src/libdf.la
 
 hdf24to8_SOURCES = hdf24to8.c
-hdf24to8_LDADD = ../src/libdf.a
-hdf24to8_DEPENDENCIES = ../src/libdf.a
+hdf24to8_LDADD = ../src/libdf.la
+hdf24to8_DEPENDENCIES = ../src/libdf.la
 
 hdf8to24_SOURCES = hdf8to24.c
-hdf8to24_LDADD = ../src/libdf.a
-hdf8to24_DEPENDENCIES = ../src/libdf.a
+hdf8to24_LDADD = ../src/libdf.la
+hdf8to24_DEPENDENCIES = ../src/libdf.la
 
 hdfcomp_SOURCES = hdfcomp.c
-hdfcomp_LDADD = ../src/libdf.a
-hdfcomp_DEPENDENCIES = ../src/libdf.a
+hdfcomp_LDADD = ../src/libdf.la
+hdfcomp_DEPENDENCIES = ../src/libdf.la
 
 hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c
-hdfed_LDADD = ../src/libdf.a
-hdfed_DEPENDENCIES = ../src/libdf.a
+hdfed_LDADD = ../src/libdf.la
+hdfed_DEPENDENCIES = ../src/libdf.la
 
 hdfls_SOURCES = hdfls.c
-hdfls_LDADD = ../src/libdf.a
-hdfls_DEPENDENCIES = ../src/libdf.a
+hdfls_LDADD = ../src/libdf.la
+hdfls_DEPENDENCIES = ../src/libdf.la
 
 hdfpack_SOURCES = hdfpack.c
-hdfpack_LDADD = ../src/libdf.a
-hdfpack_DEPENDENCIES = ../src/libdf.a
+hdfpack_LDADD = ../src/libdf.la
+hdfpack_DEPENDENCIES = ../src/libdf.la
 
 hdftopal_SOURCES = hdftopal.c
-hdftopal_LDADD = ../src/libdf.a
-hdftopal_DEPENDENCIES = ../src/libdf.a
+hdftopal_LDADD = ../src/libdf.la
+hdftopal_DEPENDENCIES = ../src/libdf.la
 
 hdftor8_SOURCES = hdftor8.c
-hdftor8_LDADD = ../src/libdf.a
-hdftor8_DEPENDENCIES = ../src/libdf.a
+hdftor8_LDADD = ../src/libdf.la
+hdftor8_DEPENDENCIES = ../src/libdf.la
 
 hdfunpac_SOURCES = hdfunpac.c
-hdfunpac_LDADD = ../src/libdf.a
-hdfunpac_DEPENDENCIES = ../src/libdf.a
+hdfunpac_LDADD = ../src/libdf.la
+hdfunpac_DEPENDENCIES = ../src/libdf.la
 
 jpeg2hdf_SOURCES = jpeg2hdf.c
-jpeg2hdf_LDADD = ../src/libdf.a
-jpeg2hdf_DEPENDENCIES = ../src/libdf.a
+jpeg2hdf_LDADD = ../src/libdf.la
+jpeg2hdf_DEPENDENCIES = ../src/libdf.la
 
 paltohdf_SOURCES = paltohdf.c
-paltohdf_LDADD = ../src/libdf.a
-paltohdf_DEPENDENCIES = ../src/libdf.a
+paltohdf_LDADD = ../src/libdf.la
+paltohdf_DEPENDENCIES = ../src/libdf.la
 
 r8tohdf_SOURCES = r8tohdf.c
-r8tohdf_LDADD = ../src/libdf.a
-r8tohdf_DEPENDENCIES = ../src/libdf.a
+r8tohdf_LDADD = ../src/libdf.la
+r8tohdf_DEPENDENCIES = ../src/libdf.la
 
 ristosds_SOURCES = ristosds.c
-ristosds_LDADD = ../src/libdf.a
-ristosds_DEPENDENCIES = ../src/libdf.a
+ristosds_LDADD = ../src/libdf.la
+ristosds_DEPENDENCIES = ../src/libdf.la
 
 vmake_SOURCES = vmake.c
-vmake_LDADD = ../src/libdf.a
-vmake_DEPENDENCIES = ../src/libdf.a
+vmake_LDADD = ../src/libdf.la
+vmake_DEPENDENCIES = ../src/libdf.la
 
 vshow_SOURCES = vshow.c
-vshow_LDADD = ../src/libdf.a
-vshow_DEPENDENCIES = ../src/libdf.a
+vshow_LDADD = ../src/libdf.la
+vshow_DEPENDENCIES = ../src/libdf.la
 
 #############################################################################
 ##                   Testing -- Here there be dragons.                     ##
--- HDF4.2r0/mfhdf/dumper/Makefile.am.orig	2003-11-07 19:38:49.000000000 +0100
+++ HDF4.2r0/mfhdf/dumper/Makefile.am	2004-03-06 13:05:56.513529672 +0100
@@ -18,8 +18,8 @@
 ## Information for building the "hdp" program
 hdp_SOURCES = hdp.c hdp_dump.c hdp_gr.c hdp_list.c hdp_rig.c hdp_sds.c      \
               hdp_util.c hdp_vd.c hdp_vg.c show.c
-hdp_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hdp_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 #############################################################################
 ##                   Testing -- Here there be dragons.                     ##
--- HDF4.2r3/mfhdf/fortran/Makefile.am.orig	2007-09-06 23:48:49.000000000 +0200
+++ HDF4.2r3/mfhdf/fortran/Makefile.am	2008-06-04 19:41:26.934667007 +0200
@@ -25,18 +25,18 @@
 if HDF_BUILD_NETCDF
 ftest_SOURCES = ftest.f
 ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
-              ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+              ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
 ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
-                     $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+                     $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 endif
 
 hdftest_SOURCES = hdftest.f
-hdftest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 tszip_SOURCES = tszip.f
-tszip_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+tszip_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 testdir:
 	-mkdir testdir
--- HDF4.2r3/mfhdf/hdfimport/Makefile.am.orig	2006-10-11 21:58:16.000000000 +0200
+++ HDF4.2r3/mfhdf/hdfimport/Makefile.am	2008-06-04 19:41:57.528410445 +0200
@@ -14,7 +14,7 @@
 ##                      Libraries to link against                          ##
 #############################################################################
 
-LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
 
 #############################################################################
 ##                          Programs to build                              ##
--- HDF4.2r3/mfhdf/hdiff/Makefile.am.orig	2007-07-17 22:37:19.000000000 +0200
+++ HDF4.2r3/mfhdf/hdiff/Makefile.am	2008-06-04 19:42:15.165415521 +0200
@@ -20,8 +20,8 @@
 hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c  \
                 hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c       \
                 hdiff_table.c hdiff_vs.c hdiff_dim.c
-hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 #############################################################################
 ##                              Testing                                    ##
@@ -32,8 +32,8 @@
 noinst_PROGRAMS = hdifftst
 
 hdifftst_SOURCES = hdifftst.c
-hdifftst_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
-hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hdifftst_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
+hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 check: hdifftst
 	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh
--- HDF4.2r3/mfhdf/hrepack/Makefile.am.orig	2007-09-18 17:12:00.000000000 +0200
+++ HDF4.2r3/mfhdf/hrepack/Makefile.am	2008-06-04 19:42:39.786818615 +0200
@@ -22,8 +22,8 @@
                   hrepack_opttable.c hrepack_parse.c                        \
                   hrepack_sds.c hrepack_sdutil.c hrepack_utils.c            \
                   hrepack_vg.c hrepack_vs.c hrepack_dim.c
-hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 #############################################################################
 ##                   Testing -- Here there be dragons.                     ##
@@ -44,12 +44,12 @@
                        ../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c        \
                        ../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c          \
                        ../hdiff/hdiff_vs.c ../hdiff/hdiff_dim.c
-test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 hrepack_check_SOURCES = hrepack_check.c
-hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 #############################################################################
 ##                          And the cleanup                                ##
--- HDF4.2r3/mfhdf/libsrc/Makefile.am.orig	2008-01-17 00:53:53.000000000 +0100
+++ HDF4.2r3/mfhdf/libsrc/Makefile.am	2008-06-04 19:43:18.953050571 +0200
@@ -13,7 +13,8 @@
 ##                          Library to build                               ##
 #############################################################################
 
-lib_LIBRARIES = libmfhdf.a
+lib_LTLIBRARIES = libmfhdf.la
+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
 
 ## Information for building the "libmfhdf.a" library
 CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c    \
@@ -31,17 +32,17 @@
 if HDF_BUILD_FORTRAN
 
 if HDF_BUILD_XDR
-libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
+libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
 else
-libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
+libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
 endif
 
 else
 
 if HDF_BUILD_XDR
-libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES)
+libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
 else
-libmfhdf_a_SOURCES = $(CSOURCES)
+libmfhdf_la_SOURCES = $(CSOURCES)
 endif
 
 endif
@@ -59,12 +60,12 @@
 check_PROGRAMS = cdftest hdftest
 
 cdftest_SOURCES = cdftest.c
-cdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
 
 hdftest_SOURCES = hdftest.c tchunk.c tcomp.c tcoordvar.c tdim.c		\
 		  temptySDSs.c tfile.c tidtypes.c tnetcdf.c trank0.c	\
 		  tsd.c tsdsprops.c tszip.c
-hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
+hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
 
 check:
 	@echo "============================"
--- HDF4.2r0/mfhdf/ncdump/Makefile.am.orig	2003-11-07 19:39:00.000000000 +0100
+++ HDF4.2r0/mfhdf/ncdump/Makefile.am	2004-03-06 13:08:09.879255000 +0100
@@ -19,8 +19,8 @@
 
 ## Information for building the "ncdump" program
 ncdump_SOURCES = dumplib.c ncdump.c vardata.c
-ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 check: ncdump $(srcdir)/test0.cdl
 	../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
--- HDF4.2r3/mfhdf/ncgen/Makefile.am.orig	2007-09-06 23:48:49.000000000 +0200
+++ HDF4.2r3/mfhdf/ncgen/Makefile.am	2008-06-04 19:45:27.852403668 +0200
@@ -29,8 +29,8 @@
 ## Information for building the "ncgen" program
 ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c      \
                 load.c main.c ncgentab.c
-ncgen_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 ctest0_SOURCES=
 ftest0_SOURCES=
@@ -102,7 +102,7 @@
 
 ftest0$(EXEEXT):		ncgen test0.cdl netcdf.inc
 	$(TESTS_ENVIRONMENT) ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
-	$(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
+	$(LIBTOOL) --mode=link --tag=F77 $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
 endif
 
 endif
@@ -118,7 +118,7 @@
 
 ctest0$(EXEEXT):		ncgen $(srcdir)/test0.cdl
 	$(TESTS_ENVIRONMENT) ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
-	$(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
+	$(LIBTOOL) --mode=link --tag=CC $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
 
 #############################################################################
 ##                            Miscellaneous                                ##
--- HDF4.2r0/mfhdf/nctest/Makefile.am.orig	2003-11-07 19:39:09.000000000 +0100
+++ HDF4.2r0/mfhdf/nctest/Makefile.am	2004-03-06 13:08:38.075968448 +0100
@@ -22,8 +22,8 @@
                  error.c misctest.c rec.c slabs.c val.c varget_unlim.c      \
                  varget.c vargetg.c varput.c varputg.c vardef.c vartests.c  \
                  vputget.c vputgetg.c
-nctest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
+nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
 
 #############################################################################
 ##                          And the cleanup                                ##
--- HDF4.2r0/configure.ac.orig	2003-11-21 21:06:01.000000000 +0100
+++ HDF4.2r0/configure.ac	2004-03-06 12:59:06.973789176 +0100
@@ -166,7 +166,7 @@
 AC_PROG_INSTALL
 AM_PROG_LEX
 AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 AC_PROG_YACC
 
 AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
Commit	Line	Data
e2953b11 JB	1	--- HDF4.2r3/hdf/src/Makefile.am.orig 2006-12-06 21:51:13.000000000 +0100
e2953b11 JB	2	+++ HDF4.2r3/hdf/src/Makefile.am 2008-06-04 19:39:45.388885271 +0200
0522bc0d JB	3	@@ -2,7 +2,7 @@
	4	## Library to build ##
	5	#############################################################################
	6
	7	-lib_LIBRARIES = libdf.a
	8	+lib_LTLIBRARIES = libdf.la
	9
	10	FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \
e2953b11 JB	11	dfr8ff.f dfsdf.c dfsdff.f dfufp2iff.f dfutilf.c herrf.c hfilef.c \
e2953b11 JB	12	@@ -27,10 +27,10 @@
0522bc0d JB	13	FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
	14
	15	if HDF_BUILD_FORTRAN
	16	-libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
	17	+libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
e2953b11	18	include_HEADERS = $(CHEADERS) hproto_fortran.h $(FHEADERS)
0522bc0d JB	19	else
	20	-libdf_a_SOURCES = $(CSOURCES)
	21	+libdf_la_SOURCES = $(CSOURCES)
	22	include_HEADERS = $(CHEADERS)
	23	endif
	24
e2953b11 JB	25	--- HDF4.2r3/hdf/test/Makefile.am.orig 2007-12-13 08:39:20.000000000 +0100
	26	+++ HDF4.2r3/hdf/test/Makefile.am 2008-06-04 19:40:41.856099802 +0200
	27	@@ -21,23 +21,23 @@
0522bc0d	28	mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \
2f1bfa95 JB	29	tdupimgs.c testhdf.c tree.c tszip.c tvattr.c tvset.c \
2f1bfa95 JB	30	tvsfpack.c vers.c
0522bc0d	31	-testhdf_LDADD = ../src/libdf.a
e2953b11	32	-testhdf_DEPENDENCIES = testdir ../src/libdf.a
0522bc0d JB	33	+testhdf_LDADD = ../src/libdf.la
	34	+testhdf_DEPENDENCIES = testdir ../src/libdf.la
	35
e2953b11 JB	36	-buffer_LDADD = ../src/libdf.a
	37	-buffer_DEPENDENCIES = ../src/libdf.a
	38	+buffer_LDADD = ../src/libdf.la
	39	+buffer_DEPENDENCIES = ../src/libdf.la
	40
0522bc0d JB	41	if HDF_BUILD_FORTRAN
0522bc0d JB	42	fortest_SOURCES = fortest.c
e2953b11 JB	43	-fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
	44	-fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
	45	+fortest_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
	46	+fortest_DEPENDENCIES = testdir fortestF ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
0522bc0d JB	47
	48	fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f \
	49	t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f \
	50	tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
	51	tvattrf.f tvsetf.f
e2953b11 JB	52	-fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
	53	-fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.a ../src/libdf.a
	54	+fortestF_LDADD = ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
	55	+fortestF_DEPENDENCIES = testdir ../../mfhdf/libsrc/libmfhdf.la ../src/libdf.la
0522bc0d JB	56	endif
	57
	58	testdir:
	59	--- HDF4.2r0/hdf/util/Makefile.am.orig 2003-11-07 19:38:46.000000000 +0100
	60	+++ HDF4.2r0/hdf/util/Makefile.am 2004-03-06 13:04:38.110448752 +0100
	61	@@ -20,76 +20,76 @@
	62	endif
	63
	64	gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c
	65	-gif2hdf_LDADD = ../src/libdf.a
	66	-gif2hdf_DEPENDENCIES = ../src/libdf.a
	67	+gif2hdf_LDADD = ../src/libdf.la
	68	+gif2hdf_DEPENDENCIES = ../src/libdf.la
	69
	70	hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c
	71	-hdf2gif_LDADD = ../src/libdf.a
	72	-hdf2gif_DEPENDENCIES = ../src/libdf.a
	73	+hdf2gif_LDADD = ../src/libdf.la
	74	+hdf2gif_DEPENDENCIES = ../src/libdf.la
	75
	76	hdf2jpeg_SOURCES = hdf2jpeg.c
	77	-hdf2jpeg_LDADD = ../src/libdf.a
	78	-hdf2jpeg_DEPENDENCIES = ../src/libdf.a
	79	+hdf2jpeg_LDADD = ../src/libdf.la
	80	+hdf2jpeg_DEPENDENCIES = ../src/libdf.la
	81
	82	hdf24to8_SOURCES = hdf24to8.c
	83	-hdf24to8_LDADD = ../src/libdf.a
	84	-hdf24to8_DEPENDENCIES = ../src/libdf.a
	85	+hdf24to8_LDADD = ../src/libdf.la
	86	+hdf24to8_DEPENDENCIES = ../src/libdf.la
	87
	88	hdf8to24_SOURCES = hdf8to24.c
	89	-hdf8to24_LDADD = ../src/libdf.a
	90	-hdf8to24_DEPENDENCIES = ../src/libdf.a
	91	+hdf8to24_LDADD = ../src/libdf.la
	92	+hdf8to24_DEPENDENCIES = ../src/libdf.la
	93
	94	hdfcomp_SOURCES = hdfcomp.c
	95	-hdfcomp_LDADD = ../src/libdf.a
	96	-hdfcomp_DEPENDENCIES = ../src/libdf.a
	97	+hdfcomp_LDADD = ../src/libdf.la
	98	+hdfcomp_DEPENDENCIES = ../src/libdf.la
	99
	100	hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c
	101	-hdfed_LDADD = ../src/libdf.a
	102	-hdfed_DEPENDENCIES = ../src/libdf.a
	103	+hdfed_LDADD = ../src/libdf.la
	104	+hdfed_DEPENDENCIES = ../src/libdf.la
	105
	106	hdfls_SOURCES = hdfls.c
	107	-hdfls_LDADD = ../src/libdf.a
	108	-hdfls_DEPENDENCIES = ../src/libdf.a
	109	+hdfls_LDADD = ../src/libdf.la
	110	+hdfls_DEPENDENCIES = ../src/libdf.la
	111
	112	hdfpack_SOURCES = hdfpack.c
	113	-hdfpack_LDADD = ../src/libdf.a
	114	-hdfpack_DEPENDENCIES = ../src/libdf.a
	115	+hdfpack_LDADD = ../src/libdf.la
	116	+hdfpack_DEPENDENCIES = ../src/libdf.la
	117
	118	hdftopal_SOURCES = hdftopal.c
	119	-hdftopal_LDADD = ../src/libdf.a
120	-hdftopal_DEPENDENCIES = ../src/libdf.a
121	+hdftopal_LDADD = ../src/libdf.la
122	+hdftopal_DEPENDENCIES = ../src/libdf.la
123
124	hdftor8_SOURCES = hdftor8.c
125	-hdftor8_LDADD = ../src/libdf.a
126	-hdftor8_DEPENDENCIES = ../src/libdf.a
127	+hdftor8_LDADD = ../src/libdf.la
128	+hdftor8_DEPENDENCIES = ../src/libdf.la
129
130	hdfunpac_SOURCES = hdfunpac.c
131	-hdfunpac_LDADD = ../src/libdf.a
132	-hdfunpac_DEPENDENCIES = ../src/libdf.a
133	+hdfunpac_LDADD = ../src/libdf.la
134	+hdfunpac_DEPENDENCIES = ../src/libdf.la
135
136	jpeg2hdf_SOURCES = jpeg2hdf.c
137	-jpeg2hdf_LDADD = ../src/libdf.a
138	-jpeg2hdf_DEPENDENCIES = ../src/libdf.a
139	+jpeg2hdf_LDADD = ../src/libdf.la
140	+jpeg2hdf_DEPENDENCIES = ../src/libdf.la
141
142	paltohdf_SOURCES = paltohdf.c
143	-paltohdf_LDADD = ../src/libdf.a
144	-paltohdf_DEPENDENCIES = ../src/libdf.a
145	+paltohdf_LDADD = ../src/libdf.la
146	+paltohdf_DEPENDENCIES = ../src/libdf.la
147
148	r8tohdf_SOURCES = r8tohdf.c
149	-r8tohdf_LDADD = ../src/libdf.a
150	-r8tohdf_DEPENDENCIES = ../src/libdf.a
151	+r8tohdf_LDADD = ../src/libdf.la
152	+r8tohdf_DEPENDENCIES = ../src/libdf.la
153
154	ristosds_SOURCES = ristosds.c
155	-ristosds_LDADD = ../src/libdf.a
156	-ristosds_DEPENDENCIES = ../src/libdf.a
157	+ristosds_LDADD = ../src/libdf.la
158	+ristosds_DEPENDENCIES = ../src/libdf.la
159
160	vmake_SOURCES = vmake.c
161	-vmake_LDADD = ../src/libdf.a
162	-vmake_DEPENDENCIES = ../src/libdf.a
163	+vmake_LDADD = ../src/libdf.la
164	+vmake_DEPENDENCIES = ../src/libdf.la
165
166	vshow_SOURCES = vshow.c
167	-vshow_LDADD = ../src/libdf.a
168	-vshow_DEPENDENCIES = ../src/libdf.a
169	+vshow_LDADD = ../src/libdf.la
170	+vshow_DEPENDENCIES = ../src/libdf.la
171
172	#############################################################################
173	## Testing -- Here there be dragons. ##
174	--- HDF4.2r0/mfhdf/dumper/Makefile.am.orig 2003-11-07 19:38:49.000000000 +0100
175	+++ HDF4.2r0/mfhdf/dumper/Makefile.am 2004-03-06 13:05:56.513529672 +0100
176	@@ -18,8 +18,8 @@
177	## Information for building the "hdp" program
178	hdp_SOURCES = hdp.c hdp_dump.c hdp_gr.c hdp_list.c hdp_rig.c hdp_sds.c \
179	hdp_util.c hdp_vd.c hdp_vg.c show.c
180	-hdp_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
181	-hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
182	+hdp_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
183	+hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
184
185	#############################################################################
186	## Testing -- Here there be dragons. ##
e2953b11 JB	187	--- HDF4.2r3/mfhdf/fortran/Makefile.am.orig 2007-09-06 23:48:49.000000000 +0200
	188	+++ HDF4.2r3/mfhdf/fortran/Makefile.am 2008-06-04 19:41:26.934667007 +0200
	189	@@ -25,18 +25,18 @@
	190	if HDF_BUILD_NETCDF
0522bc0d JB	191	ftest_SOURCES = ftest.f
	192	ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
	193	- ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	194	+ ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	195	ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
	196	- $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	197	+ $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
e2953b11	198	endif
0522bc0d JB	199
	200	hdftest_SOURCES = hdftest.f
	201	-hdftest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	202	-hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	203	+hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	204	+hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	205
e2953b11 JB	206	tszip_SOURCES = tszip.f
	207	-tszip_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	208	-tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	209	+tszip_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	210	+tszip_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	211
0522bc0d JB	212	testdir:
0522bc0d JB	213	-mkdir testdir
e2953b11 JB	214	--- HDF4.2r3/mfhdf/hdfimport/Makefile.am.orig 2006-10-11 21:58:16.000000000 +0200
	215	+++ HDF4.2r3/mfhdf/hdfimport/Makefile.am 2008-06-04 19:41:57.528410445 +0200
	216	@@ -14,7 +14,7 @@
	217	## Libraries to link against ##
	218	#############################################################################
0522bc0d	219
e2953b11 JB	220	-LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
e2953b11 JB	221	+LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
0522bc0d JB	222
0522bc0d JB	223	#############################################################################
e2953b11 JB	224	## Programs to build ##
	225	--- HDF4.2r3/mfhdf/hdiff/Makefile.am.orig 2007-07-17 22:37:19.000000000 +0200
	226	+++ HDF4.2r3/mfhdf/hdiff/Makefile.am 2008-06-04 19:42:15.165415521 +0200
0522bc0d JB	227	@@ -20,8 +20,8 @@
	228	hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \
	229	hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \
e2953b11	230	hdiff_table.c hdiff_vs.c hdiff_dim.c
0522bc0d JB	231	-hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	232	-hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	233	+hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	234	+hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	235
	236	#############################################################################
	237	## Testing ##
	238	@@ -32,8 +32,8 @@
	239	noinst_PROGRAMS = hdifftst
	240
	241	hdifftst_SOURCES = hdifftst.c
	242	-hdifftst_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	243	-hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	244	+hdifftst_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	245	+hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	246
	247	check: hdifftst
	248	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh
e2953b11 JB	249	--- HDF4.2r3/mfhdf/hrepack/Makefile.am.orig 2007-09-18 17:12:00.000000000 +0200
e2953b11 JB	250	+++ HDF4.2r3/mfhdf/hrepack/Makefile.am 2008-06-04 19:42:39.786818615 +0200
0522bc0d	251	@@ -22,8 +22,8 @@
e2953b11	252	hrepack_opttable.c hrepack_parse.c \
0522bc0d	253	hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \
e2953b11	254	hrepack_vg.c hrepack_vs.c hrepack_dim.c
0522bc0d JB	255	-hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
	256	-hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	257	+hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
	258	+hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	259
	260	#############################################################################
	261	## Testing -- Here there be dragons. ##
e2953b11	262	@@ -44,12 +44,12 @@
0522bc0d JB	263	../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \
0522bc0d JB	264	../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \
e2953b11	265	../hdiff/hdiff_vs.c ../hdiff/hdiff_dim.c
0522bc0d JB	266	-test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
	267	-test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	268	+test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
	269	+test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	270
	271	hrepack_check_SOURCES = hrepack_check.c
	272	-hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
	273	-hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	274	+hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
	275	+hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	276
e2953b11 JB	277	#############################################################################
	278	## And the cleanup ##
	279	--- HDF4.2r3/mfhdf/libsrc/Makefile.am.orig 2008-01-17 00:53:53.000000000 +0100
	280	+++ HDF4.2r3/mfhdf/libsrc/Makefile.am 2008-06-04 19:43:18.953050571 +0200
	281	@@ -13,7 +13,8 @@
0522bc0d JB	282	## Library to build ##
	283	#############################################################################
	284
	285	-lib_LIBRARIES = libmfhdf.a
	286	+lib_LTLIBRARIES = libmfhdf.la
e2953b11	287	+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
0522bc0d JB	288
	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 \
e2953b11	291	@@ -31,17 +32,17 @@
0522bc0d JB	292	if HDF_BUILD_FORTRAN
	293
	294	if HDF_BUILD_XDR
	295	-libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
	296	+libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
	297	else
	298	-libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES)
	299	+libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
	300	endif
	301
	302	else
	303
	304	if HDF_BUILD_XDR
	305	-libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES)
	306	+libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
	307	else
	308	-libmfhdf_a_SOURCES = $(CSOURCES)
	309	+libmfhdf_la_SOURCES = $(CSOURCES)
	310	endif
	311
	312	endif
e2953b11	313	@@ -59,12 +60,12 @@
0522bc0d JB	314	check_PROGRAMS = cdftest hdftest
	315
	316	cdftest_SOURCES = cdftest.c
	317	-cdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	318	+cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	319
e2953b11 JB	320	hdftest_SOURCES = hdftest.c tchunk.c tcomp.c tcoordvar.c tdim.c \
	321	temptySDSs.c tfile.c tidtypes.c tnetcdf.c trank0.c \
	322	tsd.c tsdsprops.c tszip.c
0522bc0d JB	323	-hdftest_LDADD = libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@
	324	+hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
	325
	326	check:
	327	@echo "============================"
	328	--- HDF4.2r0/mfhdf/ncdump/Makefile.am.orig 2003-11-07 19:39:00.000000000 +0100
	329	+++ HDF4.2r0/mfhdf/ncdump/Makefile.am 2004-03-06 13:08:09.879255000 +0100
	330	@@ -19,8 +19,8 @@
	331
	332	## Information for building the "ncdump" program
	333	ncdump_SOURCES = dumplib.c ncdump.c vardata.c
	334	-ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
	335	-ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	336	+ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
	337	+ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	338
	339	check: ncdump $(srcdir)/test0.cdl
	340	../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
e2953b11 JB	341	--- HDF4.2r3/mfhdf/ncgen/Makefile.am.orig 2007-09-06 23:48:49.000000000 +0200
	342	+++ HDF4.2r3/mfhdf/ncgen/Makefile.am 2008-06-04 19:45:27.852403668 +0200
	343	@@ -29,8 +29,8 @@
0522bc0d JB	344	## Information for building the "ncgen" program
	345	ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \
	346	load.c main.c ncgentab.c
	347	-ncgen_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
	348	-ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	349	+ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
	350	+ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	351
e2953b11 JB	352	ctest0_SOURCES=
	353	ftest0_SOURCES=
	354	@@ -102,7 +102,7 @@
2f1bfa95	355
e2953b11 JB	356	ftest0$(EXEEXT): ncgen test0.cdl netcdf.inc
e2953b11 JB	357	$(TESTS_ENVIRONMENT) ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
2f1bfa95 JB	358	- $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
	359	+ $(LIBTOOL) --mode=link --tag=F77 $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
	360	endif
	361
e2953b11 JB	362	endif
e2953b11 JB	363	@@ -118,7 +118,7 @@
2f1bfa95	364
e2953b11 JB	365	ctest0$(EXEEXT): ncgen $(srcdir)/test0.cdl
e2953b11 JB	366	$(TESTS_ENVIRONMENT) ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
2f1bfa95	367	- $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
e2953b11	368	+ $(LIBTOOL) --mode=link --tag=CC $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS)
2f1bfa95 JB	369
	370	#############################################################################
	371	## Miscellaneous ##
0522bc0d JB	372	--- HDF4.2r0/mfhdf/nctest/Makefile.am.orig 2003-11-07 19:39:09.000000000 +0100
	373	+++ HDF4.2r0/mfhdf/nctest/Makefile.am 2004-03-06 13:08:38.075968448 +0100
	374	@@ -22,8 +22,8 @@
	375	error.c misctest.c rec.c slabs.c val.c varget_unlim.c \
	376	varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
	377	vputget.c vputgetg.c
	378	-nctest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
	379	-nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a
	380	+nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
	381	+nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
	382
	383	#############################################################################
	384	## And the cleanup ##
	385	--- HDF4.2r0/configure.ac.orig 2003-11-21 21:06:01.000000000 +0100
	386	+++ HDF4.2r0/configure.ac 2004-03-06 12:59:06.973789176 +0100
	387	@@ -166,7 +166,7 @@
	388	AC_PROG_INSTALL
	389	AM_PROG_LEX
	390	AC_PROG_LN_S
	391	-AC_PROG_RANLIB
	392	+AC_PROG_LIBTOOL
	393	AC_PROG_YACC
	394
	395	AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])