diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2007-08-18 12:07:07 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2007-08-18 12:07:07 +0000 |
commit | 76bfbb2f84a2c374f29adce56fd8530f2225aa02 (patch) | |
tree | 65d47f0b7f887f041c5088f999d177c0e7ee5e5b /sci-libs/hdf/files | |
parent | Cleanup ebuild. (diff) | |
download | gentoo-2-76bfbb2f84a2c374f29adce56fd8530f2225aa02.tar.gz gentoo-2-76bfbb2f84a2c374f29adce56fd8530f2225aa02.tar.bz2 gentoo-2-76bfbb2f84a2c374f29adce56fd8530f2225aa02.zip |
Version bump with new patches and cleanup (bug #186524), removed buggy version (bug #160051).
(Portage version: 2.1.2.11)
Diffstat (limited to 'sci-libs/hdf/files')
-rw-r--r-- | sci-libs/hdf/files/digest-hdf-4.2.0-r3 | 3 | ||||
-rw-r--r-- | sci-libs/hdf/files/digest-hdf-4.2.1_p4 | 3 | ||||
-rw-r--r-- | sci-libs/hdf/files/hdf-4.2.1_p4-maxavailfiles.patch | 11 | ||||
-rw-r--r-- | sci-libs/hdf/files/hdf-4.2.1_p4-shared-libs.patch | 427 |
4 files changed, 441 insertions, 3 deletions
diff --git a/sci-libs/hdf/files/digest-hdf-4.2.0-r3 b/sci-libs/hdf/files/digest-hdf-4.2.0-r3 deleted file mode 100644 index 320263485394..000000000000 --- a/sci-libs/hdf/files/digest-hdf-4.2.0-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9d3ee529a7f8464481c0cc241a92d076 hdf4.2r0.tar.gz 3738135 -RMD160 b0a32930d85045d750ee3ef8a717c583946d6f9d hdf4.2r0.tar.gz 3738135 -SHA256 8e18fe97ae6c2f3c9135c9f4d2f26647e4dbb5a1ec7429f59647532cabbe07f5 hdf4.2r0.tar.gz 3738135 diff --git a/sci-libs/hdf/files/digest-hdf-4.2.1_p4 b/sci-libs/hdf/files/digest-hdf-4.2.1_p4 new file mode 100644 index 000000000000..75b481de1038 --- /dev/null +++ b/sci-libs/hdf/files/digest-hdf-4.2.1_p4 @@ -0,0 +1,3 @@ +MD5 47e42192b00814d8f815b7b4f8243b01 4.2r1-hrepack-p4.tar.gz 3932082 +RMD160 b281b282d58d00f5f163381bff35cc5979591f0f 4.2r1-hrepack-p4.tar.gz 3932082 +SHA256 6cebc6c7e7cd0d6b0cfc64f8c0d63470536532d66f5946bb79dfe50aa079c1be 4.2r1-hrepack-p4.tar.gz 3932082 diff --git a/sci-libs/hdf/files/hdf-4.2.1_p4-maxavailfiles.patch b/sci-libs/hdf/files/hdf-4.2.1_p4-maxavailfiles.patch new file mode 100644 index 000000000000..b414718c8745 --- /dev/null +++ b/sci-libs/hdf/files/hdf-4.2.1_p4-maxavailfiles.patch @@ -0,0 +1,11 @@ +--- mfhdf/libsrc/file.c.orig 2007-08-17 19:29:53.599016858 +0100 ++++ mfhdf/libsrc/file.c 2007-08-17 19:29:11.936642654 +0100 +@@ -31,7 +31,7 @@ + + /* Maximum number of files can be opened at one time; subtract 3 from + the system allowed to account for stdin, stdout, and stderr */ +-#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3) ++#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10) + + static int _ncdf = 0 ; /* high water mark on open cdf's */ + static NC **_cdfs; diff --git a/sci-libs/hdf/files/hdf-4.2.1_p4-shared-libs.patch b/sci-libs/hdf/files/hdf-4.2.1_p4-shared-libs.patch new file mode 100644 index 000000000000..00c11a7ffc6e --- /dev/null +++ b/sci-libs/hdf/files/hdf-4.2.1_p4-shared-libs.patch @@ -0,0 +1,427 @@ +diff -Nur ../4.2r1-hrepack-p4.orig/configure.ac ./configure.ac +--- ../4.2r1-hrepack-p4.orig/configure.ac 2006-06-07 17:30:34.000000000 +0100 ++++ ./configure.ac 2007-08-17 22:22:33.950575795 +0100 +@@ -155,7 +155,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]) +diff -Nur ../4.2r1-hrepack-p4.orig/hdf/src/Makefile.am ./hdf/src/Makefile.am +--- ../4.2r1-hrepack-p4.orig/hdf/src/Makefile.am 2003-12-10 21:13:16.000000000 +0000 ++++ ./hdf/src/Makefile.am 2007-08-17 22:22:35.146643955 +0100 +@@ -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 dfufp2if.f dfutilf.c herrf.c hfilef.c \ +@@ -26,10 +26,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) $(FHEADERS) + else +-libdf_a_SOURCES = $(CSOURCES) ++libdf_la_SOURCES = $(CSOURCES) + include_HEADERS = $(CHEADERS) + endif + +diff -Nur ../4.2r1-hrepack-p4.orig/hdf/test/Makefile.am ./hdf/test/Makefile.am +--- ../4.2r1-hrepack-p4.orig/hdf/test/Makefile.am 2006-03-14 20:42:24.000000000 +0000 ++++ ./hdf/test/Makefile.am 2007-08-17 22:22:36.354712799 +0100 +@@ -21,20 +21,20 @@ + 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 + + if HDF_BUILD_FORTRAN + fortest_SOURCES = fortest.c +-fortest_LDADD = ../src/libdf.a +-fortest_DEPENDENCIES = testdir fortestF ../src/libdf.a ++fortest_LDADD = ../src/libdf.la ++fortest_DEPENDENCIES = testdir fortestF ../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 = ../src/libdf.a +-fortestF_DEPENDENCIES = testdir ../src/libdf.a ++fortestF_LDADD = ../src/libdf.la ++fortestF_DEPENDENCIES = testdir ../src/libdf.la + endif + + # On some platforms (RedStorm), tests need to be invoked with a certain +diff -Nur ../4.2r1-hrepack-p4.orig/hdf/util/Makefile.am ./hdf/util/Makefile.am +--- ../4.2r1-hrepack-p4.orig/hdf/util/Makefile.am 2003-12-10 21:13:45.000000000 +0000 ++++ ./hdf/util/Makefile.am 2007-08-17 22:22:37.510778680 +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. ## +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/dumper/Makefile.am ./mfhdf/dumper/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/dumper/Makefile.am 2003-12-10 21:13:59.000000000 +0000 ++++ ./mfhdf/dumper/Makefile.am 2007-08-17 22:22:39.054866672 +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. ## +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/fortran/Makefile.am ./mfhdf/fortran/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/fortran/Makefile.am 2006-03-14 20:42:33.000000000 +0000 ++++ ./mfhdf/fortran/Makefile.am 2007-08-17 22:22:40.134928222 +0100 +@@ -19,13 +19,13 @@ + + 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 + + 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 + + testdir: + -mkdir testdir +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/hdfimport/Makefile.am ./mfhdf/hdfimport/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/hdfimport/Makefile.am 2005-10-10 18:14:02.000000000 +0100 ++++ ./mfhdf/hdfimport/Makefile.am 2007-08-17 22:22:40.810966747 +0100 +@@ -17,8 +17,8 @@ + bin_PROGRAMS = hdfimport + + hdfimport_SOURCES = hdfimport.c +-hdfimport_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ +-hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a ++hdfimport_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ ++hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la + + ############################################################################# + ## Testing -- Here there be dragons. ## +@@ -28,8 +28,8 @@ + check_SCRIPTS = testutil.sh + + hdfimporttest_SOURCES = hdfimporttest.c +-hdfimporttest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@ +-hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a ++hdfimporttest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@ ++hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la + + check: hdfimporttest$(EXEEXT) + @$(SHELL) ./testutil.sh +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/hdiff/Makefile.am ./mfhdf/hdiff/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/hdiff/Makefile.am 2004-12-01 17:59:40.000000000 +0000 ++++ ./mfhdf/hdiff/Makefile.am 2007-08-17 22:22:41.242991366 +0100 +@@ -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_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 +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/hrepack/Makefile.am ./mfhdf/hrepack/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/hrepack/Makefile.am 2006-05-16 18:02:03.000000000 +0100 ++++ ./mfhdf/hrepack/Makefile.am 2007-08-17 22:22:41.551008919 +0100 +@@ -22,8 +22,8 @@ + hrepack_opttable.c hrepack_pal.c hrepack_parse.c \ + hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \ + hrepack_vg.c hrepack_vs.c hrepack_mattbl.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 +-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 + + check: test_hrepack$(EXEEXT) + @srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/libsrc/Makefile.am ./mfhdf/libsrc/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/libsrc/Makefile.am 2006-03-14 20:42:35.000000000 +0000 ++++ ./mfhdf/libsrc/Makefile.am 2007-08-17 22:22:41.575010287 +0100 +@@ -13,9 +13,9 @@ + ## Library to build ## + ############################################################################# + +-lib_LIBRARIES = libmfhdf.a ++lib_LTLIBRARIES = libmfhdf.la + +-## Information for building the "libmfhdf.a" library ++## Information for building the "libmfhdf.la" library + CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \ + globdef.c mfsd.c nssdc.c putget.c putgetg.c sharray.c string.c \ + var.c xdrposix.c +@@ -25,17 +25,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 +@@ -49,11 +49,11 @@ + 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 tcoordvar.c temptySDSs.c tfile.c \ + tidtypes.c trank0.c tsd.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 "============================" +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/ncdump/Makefile.am ./mfhdf/ncdump/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/ncdump/Makefile.am 2003-12-10 21:15:23.000000000 +0000 ++++ ./mfhdf/ncdump/Makefile.am 2007-08-17 22:22:41.611012339 +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 +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/ncgen/Makefile.am ./mfhdf/ncgen/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/ncgen/Makefile.am 2005-10-10 18:14:04.000000000 +0100 ++++ ./mfhdf/ncgen/Makefile.am 2007-08-17 23:44:29.786096870 +0100 +@@ -16,17 +16,11 @@ + + bin_PROGRAMS = ncgen + +-if HDF_BUILD_FORTRAN +-noinst_PROGRAMS = ctest0 ftest0 +-else +-noinst_PROGRAMS = ctest0 +-endif +- + ## 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= +@@ -91,7 +85,7 @@ + + ftest0$(EXEEXT): ncgen test0.cdl netcdf.inc + ./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) $(AM_FFLAGS) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS) + endif + + netcdf.inc: +@@ -105,7 +99,7 @@ + + ctest0$(EXEEXT): ncgen $(srcdir)/test0.cdl + ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c +- $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS) ++ $(LINK) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS) + + ############################################################################# + ## Miscellaneous ## +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/nctest/Makefile.am ./mfhdf/nctest/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/nctest/Makefile.am 2006-03-14 20:42:37.000000000 +0000 ++++ ./mfhdf/nctest/Makefile.am 2007-08-17 22:22:41.627013251 +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 + + # On some platforms (RedStorm), tests need to be invoked with a certain + # command. HDF traditionally uses RUNSERIAL to hold the name of this +diff -Nur ../4.2r1-hrepack-p4.orig/mfhdf/port/Makefile.am ./mfhdf/port/Makefile.am +--- ../4.2r1-hrepack-p4.orig/mfhdf/port/Makefile.am 2004-12-01 17:59:45.000000000 +0000 ++++ ./mfhdf/port/Makefile.am 2007-08-17 22:22:41.651014618 +0100 +@@ -1,2 +1,2 @@ +-noinst_LIBRARIES = libudport.a +-libudport_a_SOURCES = uddummy.c ++noinst_LTLIBRARIES = libudport.la ++libudport_la_SOURCES = uddummy.c |