Attachment #49375 for bug #75415

Lines 166-172 Link Here

(-)hdf4.2r0.orig/configure.ac (-1 / +1 lines)
166	AC_PROG_INSTALL	166	AC_PROG_INSTALL
167	AM_PROG_LEX	167	AM_PROG_LEX
168	AC_PROG_LN_S	168	AC_PROG_LN_S
169	AC_PROG_RANLIB	169	AC_PROG_LIBTOOL
170	AC_PROG_YACC	170	AC_PROG_YACC
171		171
172	AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])	172	AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])




##                          Library to build                               ##
#############################################################################

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  \

FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc

if HDF_BUILD_FORTRAN
libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
include_HEADERS = $(CHEADERS) $(FHEADERS)
else
libdf_la_SOURCES = $(CSOURCES)
include_HEADERS = $(CHEADERS)
endif





endif

gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c
gif2hdf_LDADD = ../src/libdf.la
gif2hdf_DEPENDENCIES = ../src/libdf.la

hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c
hdf2gif_LDADD = ../src/libdf.la
hdf2gif_DEPENDENCIES = ../src/libdf.la

hdf2jpeg_SOURCES = hdf2jpeg.c
hdf2jpeg_LDADD = ../src/libdf.la
hdf2jpeg_DEPENDENCIES = ../src/libdf.la

hdf24to8_SOURCES = hdf24to8.c
hdf24to8_LDADD = ../src/libdf.la
hdf24to8_DEPENDENCIES = ../src/libdf.la

hdf8to24_SOURCES = hdf8to24.c
hdf8to24_LDADD = ../src/libdf.la
hdf8to24_DEPENDENCIES = ../src/libdf.la

hdfcomp_SOURCES = hdfcomp.c
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.la
hdfed_DEPENDENCIES = ../src/libdf.la

hdfls_SOURCES = hdfls.c
hdfls_LDADD = ../src/libdf.la
hdfls_DEPENDENCIES = ../src/libdf.la

hdfpack_SOURCES = hdfpack.c
hdfpack_LDADD = ../src/libdf.la
hdfpack_DEPENDENCIES = ../src/libdf.la

hdftopal_SOURCES = hdftopal.c
hdftopal_LDADD = ../src/libdf.la
hdftopal_DEPENDENCIES = ../src/libdf.la

hdftor8_SOURCES = hdftor8.c
hdftor8_LDADD = ../src/libdf.la
hdftor8_DEPENDENCIES = ../src/libdf.la

hdfunpac_SOURCES = hdfunpac.c
hdfunpac_LDADD = ../src/libdf.la
hdfunpac_DEPENDENCIES = ../src/libdf.la

jpeg2hdf_SOURCES = jpeg2hdf.c
jpeg2hdf_LDADD = ../src/libdf.la
jpeg2hdf_DEPENDENCIES = ../src/libdf.la

paltohdf_SOURCES = paltohdf.c
paltohdf_LDADD = ../src/libdf.la
paltohdf_DEPENDENCIES = ../src/libdf.la

r8tohdf_SOURCES = r8tohdf.c
r8tohdf_LDADD = ../src/libdf.la
r8tohdf_DEPENDENCIES = ../src/libdf.la

ristosds_SOURCES = ristosds.c
ristosds_LDADD = ../src/libdf.la
ristosds_DEPENDENCIES = ../src/libdf.la

vmake_SOURCES = vmake.c
vmake_LDADD = ../src/libdf.la
vmake_DEPENDENCIES = ../src/libdf.la

vshow_SOURCES = vshow.c
vshow_LDADD = ../src/libdf.la
vshow_DEPENDENCIES = ../src/libdf.la

#############################################################################
##                   Testing -- Here there be dragons.                     ##




##                          Library to build                               ##
#############################################################################

lib_LTLIBRARIES = libmfhdf.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    \

if HDF_BUILD_FORTRAN

if HDF_BUILD_XDR
libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
else
libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
endif

else

if HDF_BUILD_XDR
libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
else
libmfhdf_la_SOURCES = $(CSOURCES)
endif

endif

Lines 1-2 Link Here

(-)hdf4.2r0.orig/mfhdf/port/Makefile.am (-2 / +2 lines)
1	lib_LIBRARIES = libudport.a	1	lib_LTLIBRARIES = libudport.la
2	libudport_a_SOURCES = uddummy.c	2	libudport_la_SOURCES = uddummy.c




                  mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c  \
                  testhdf.c tree.c tszip.c tvattr.c tvset.c tvsfpack.c      \
                  vers.c
testhdf_LDADD = ../src/libdf.la
testhdf_DEPENDENCIES = testdir ../src/libdf.la

if HDF_BUILD_FORTRAN
fortest_SOURCES = fortest.c
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.la
fortestF_DEPENDENCIES = testdir ../src/libdf.la
endif

testdir:

Lines 18-25 Link Here

(-)hdf4.2r0.orig/mfhdf/dumper/Makefile.am (-2 / +2 lines)
18	## Information for building the "hdp" program	18	## Information for building the "hdp" program
19	hdp_SOURCES = hdp.c hdp_dump.c hdp_gr.c hdp_list.c hdp_rig.c hdp_sds.c \	19	hdp_SOURCES = hdp.c hdp_dump.c hdp_gr.c hdp_list.c hdp_rig.c hdp_sds.c \
20	hdp_util.c hdp_vd.c hdp_vg.c show.c	20	hdp_util.c hdp_vd.c hdp_vg.c show.c
21	hdp_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	21	hdp_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
22	hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	22	hdp_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
23		23
24	#############################################################################	24	#############################################################################
25	## Testing -- Here there be dragons. ##	25	## Testing -- Here there be dragons. ##





ftest_SOURCES = ftest.f
ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
              ../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.la ../libsrc/libmfhdf.la

hdftest_SOURCES = hdftest.f
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




bin_PROGRAMS = hdfimport

hdfimport_SOURCES = hdfimport.c
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.                     ##

check_SCRIPTS = testutil.sh

hdfimporttest_SOURCES = hdfimporttest.c
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
	@$(SHELL) ./testutil.sh




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.la $(top_builddir)/hdf/src/libdf.la @LIBS@
hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la

#############################################################################
##                              Testing                                    ##

noinst_PROGRAMS = hdifftst

hdifftst_SOURCES = hdifftst.c
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




                  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_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.                     ##

                       ../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.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.la $(top_builddir)/hdf/src/libdf.la
hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la

check: test_hrepack
	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh





lib_LTLIBRARIES = libmfhdf.la

## 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

check_PROGRAMS = cdftest hdftest

cdftest_SOURCES = cdftest.c
cdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@

hdftest_SOURCES = hdftest.c tszip.c
hdftest_LDADD = libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@

check:
	@echo "============================"

Lines 19-26 Link Here

(-)hdf4.2r0.orig/mfhdf/ncdump/Makefile.am (-2 / +2 lines)
19		19
20	## Information for building the "ncdump" program	20	## Information for building the "ncdump" program
21	ncdump_SOURCES = dumplib.c ncdump.c vardata.c	21	ncdump_SOURCES = dumplib.c ncdump.c vardata.c
22	ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a	22	ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
23	ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	23	ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
24		24
25	check: ncdump $(srcdir)/test0.cdl	25	check: ncdump $(srcdir)/test0.cdl
26	../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl	26	../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl

Lines 19-26 Link Here

(-)hdf4.2r0.orig/mfhdf/ncgen/Makefile.am (-2 / +2 lines)
19	## Information for building the "ncgen" program	19	## Information for building the "ncgen" program
20	ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \	20	ncgen_SOURCES = close.c escapes.c generate.c genlib.c getfill.c init.c \
21	load.c main.c ncgentab.c	21	load.c main.c ncgentab.c
22	ncgen_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a	22	ncgen_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
23	ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	23	ncgen_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
24		24
25	## Recipe for building the ncgentab.c file	25	## Recipe for building the ncgentab.c file
26	ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c	26	ncgentab.c ncgentab.h: ncgen.h ncgen.y ncgenyy.c

Lines 22-29 Link Here

(-)hdf4.2r0.orig/mfhdf/nctest/Makefile.am (-2 / +2 lines)
22	error.c misctest.c rec.c slabs.c val.c varget_unlim.c \	22	error.c misctest.c rec.c slabs.c val.c varget_unlim.c \
23	varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \	23	varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
24	vputget.c vputgetg.c	24	vputget.c vputgetg.c
25	nctest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a	25	nctest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
26	nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	26	nctest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
27		27
28	#############################################################################	28	#############################################################################
29	## And the cleanup ##	29	## And the cleanup ##

Return to bug 75415

Lines 20-95 Link Here

(-)hdf4.2r0.orig/hdf/util/Makefile.am (-36 / +36 lines)
20	endif	20	endif
21		21
22	gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c	22	gif2hdf_SOURCES = gif2hdf.c gif2mem.c gifread.c decompress.c writehdf.c
23	gif2hdf_LDADD = ../src/libdf.a	23	gif2hdf_LDADD = ../src/libdf.la
24	gif2hdf_DEPENDENCIES = ../src/libdf.a	24	gif2hdf_DEPENDENCIES = ../src/libdf.la
25		25
26	hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c	26	hdf2gif_SOURCES = hdf2gif.c hdfgifwr.c
27	hdf2gif_LDADD = ../src/libdf.a	27	hdf2gif_LDADD = ../src/libdf.la
28	hdf2gif_DEPENDENCIES = ../src/libdf.a	28	hdf2gif_DEPENDENCIES = ../src/libdf.la
29		29
30	hdf2jpeg_SOURCES = hdf2jpeg.c	30	hdf2jpeg_SOURCES = hdf2jpeg.c
31	hdf2jpeg_LDADD = ../src/libdf.a	31	hdf2jpeg_LDADD = ../src/libdf.la
32	hdf2jpeg_DEPENDENCIES = ../src/libdf.a	32	hdf2jpeg_DEPENDENCIES = ../src/libdf.la
33		33
34	hdf24to8_SOURCES = hdf24to8.c	34	hdf24to8_SOURCES = hdf24to8.c
35	hdf24to8_LDADD = ../src/libdf.a	35	hdf24to8_LDADD = ../src/libdf.la
36	hdf24to8_DEPENDENCIES = ../src/libdf.a	36	hdf24to8_DEPENDENCIES = ../src/libdf.la
37		37
38	hdf8to24_SOURCES = hdf8to24.c	38	hdf8to24_SOURCES = hdf8to24.c
39	hdf8to24_LDADD = ../src/libdf.a	39	hdf8to24_LDADD = ../src/libdf.la
40	hdf8to24_DEPENDENCIES = ../src/libdf.a	40	hdf8to24_DEPENDENCIES = ../src/libdf.la
41		41
42	hdfcomp_SOURCES = hdfcomp.c	42	hdfcomp_SOURCES = hdfcomp.c
43	hdfcomp_LDADD = ../src/libdf.a	43	hdfcomp_LDADD = ../src/libdf.la
44	hdfcomp_DEPENDENCIES = ../src/libdf.a	44	hdfcomp_DEPENDENCIES = ../src/libdf.la
45		45
46	hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c	46	hdfed_SOURCES = he_cntrl.c he_disp.c he_file.c he_main.c
47	hdfed_LDADD = ../src/libdf.a	47	hdfed_LDADD = ../src/libdf.la
48	hdfed_DEPENDENCIES = ../src/libdf.a	48	hdfed_DEPENDENCIES = ../src/libdf.la
49		49
50	hdfls_SOURCES = hdfls.c	50	hdfls_SOURCES = hdfls.c
51	hdfls_LDADD = ../src/libdf.a	51	hdfls_LDADD = ../src/libdf.la
52	hdfls_DEPENDENCIES = ../src/libdf.a	52	hdfls_DEPENDENCIES = ../src/libdf.la
53		53
54	hdfpack_SOURCES = hdfpack.c	54	hdfpack_SOURCES = hdfpack.c
55	hdfpack_LDADD = ../src/libdf.a	55	hdfpack_LDADD = ../src/libdf.la
56	hdfpack_DEPENDENCIES = ../src/libdf.a	56	hdfpack_DEPENDENCIES = ../src/libdf.la
57		57
58	hdftopal_SOURCES = hdftopal.c	58	hdftopal_SOURCES = hdftopal.c
59	hdftopal_LDADD = ../src/libdf.a	59	hdftopal_LDADD = ../src/libdf.la
60	hdftopal_DEPENDENCIES = ../src/libdf.a	60	hdftopal_DEPENDENCIES = ../src/libdf.la
61		61
62	hdftor8_SOURCES = hdftor8.c	62	hdftor8_SOURCES = hdftor8.c
63	hdftor8_LDADD = ../src/libdf.a	63	hdftor8_LDADD = ../src/libdf.la
64	hdftor8_DEPENDENCIES = ../src/libdf.a	64	hdftor8_DEPENDENCIES = ../src/libdf.la
65		65
66	hdfunpac_SOURCES = hdfunpac.c	66	hdfunpac_SOURCES = hdfunpac.c
67	hdfunpac_LDADD = ../src/libdf.a	67	hdfunpac_LDADD = ../src/libdf.la
68	hdfunpac_DEPENDENCIES = ../src/libdf.a	68	hdfunpac_DEPENDENCIES = ../src/libdf.la
69		69
70	jpeg2hdf_SOURCES = jpeg2hdf.c	70	jpeg2hdf_SOURCES = jpeg2hdf.c
71	jpeg2hdf_LDADD = ../src/libdf.a	71	jpeg2hdf_LDADD = ../src/libdf.la
72	jpeg2hdf_DEPENDENCIES = ../src/libdf.a	72	jpeg2hdf_DEPENDENCIES = ../src/libdf.la
73		73
74	paltohdf_SOURCES = paltohdf.c	74	paltohdf_SOURCES = paltohdf.c
75	paltohdf_LDADD = ../src/libdf.a	75	paltohdf_LDADD = ../src/libdf.la
76	paltohdf_DEPENDENCIES = ../src/libdf.a	76	paltohdf_DEPENDENCIES = ../src/libdf.la
77		77
78	r8tohdf_SOURCES = r8tohdf.c	78	r8tohdf_SOURCES = r8tohdf.c
79	r8tohdf_LDADD = ../src/libdf.a	79	r8tohdf_LDADD = ../src/libdf.la
80	r8tohdf_DEPENDENCIES = ../src/libdf.a	80	r8tohdf_DEPENDENCIES = ../src/libdf.la
81		81
82	ristosds_SOURCES = ristosds.c	82	ristosds_SOURCES = ristosds.c
83	ristosds_LDADD = ../src/libdf.a	83	ristosds_LDADD = ../src/libdf.la
84	ristosds_DEPENDENCIES = ../src/libdf.a	84	ristosds_DEPENDENCIES = ../src/libdf.la
85		85
86	vmake_SOURCES = vmake.c	86	vmake_SOURCES = vmake.c
87	vmake_LDADD = ../src/libdf.a	87	vmake_LDADD = ../src/libdf.la
88	vmake_DEPENDENCIES = ../src/libdf.a	88	vmake_DEPENDENCIES = ../src/libdf.la
89		89
90	vshow_SOURCES = vshow.c	90	vshow_SOURCES = vshow.c
91	vshow_LDADD = ../src/libdf.a	91	vshow_LDADD = ../src/libdf.la
92	vshow_DEPENDENCIES = ../src/libdf.a	92	vshow_DEPENDENCIES = ../src/libdf.la
93		93
94	#############################################################################	94	#############################################################################
95	## Testing -- Here there be dragons. ##	95	## Testing -- Here there be dragons. ##

Lines 2-8 Link Here

(-)hdf4.2r0.orig/hdf/src/Makefile.am (-3 / +3 lines)
2	## Library to build ##	2	## Library to build ##
3	#############################################################################	3	#############################################################################
4		4
5	lib_LIBRARIES = libdf.a	5	lib_LTLIBRARIES = libdf.la
6		6
7	FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \	7	FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c \
8	dfr8ff.f dfsdf.c dfsdff.f dfufp2if.f dfutilf.c herrf.c hfilef.c \	8	dfr8ff.f dfsdf.c dfsdff.f dfufp2if.f dfutilf.c herrf.c hfilef.c \
Lines 26-35 Link Here
26	FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc	26	FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc
27		27
28	if HDF_BUILD_FORTRAN	28	if HDF_BUILD_FORTRAN
29	libdf_a_SOURCES = $(CSOURCES) $(FSOURCES)	29	libdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
30	include_HEADERS = $(CHEADERS) $(FHEADERS)	30	include_HEADERS = $(CHEADERS) $(FHEADERS)
31	else	31	else
32	libdf_a_SOURCES = $(CSOURCES)	32	libdf_la_SOURCES = $(CSOURCES)
33	include_HEADERS = $(CHEADERS)	33	include_HEADERS = $(CHEADERS)
34	endif	34	endif
35		35

Lines 13-19 Link Here

(-)hdf4.2r0.orig/mfhdf/libsrc/Makefile.am (-5 / +5 lines)
13	## Library to build ##	13	## Library to build ##
14	#############################################################################	14	#############################################################################
15		15
16	lib_LIBRARIES = libmfhdf.a	16	lib_LTLIBRARIES = libmfhdf.la
17		17
18	## Information for building the "libmfhdf.a" library	18	## Information for building the "libmfhdf.a" library
19	CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \	19	CSOURCES=array.c attr.c cdf.c dim.c file.c hdfsds.c iarray.c error.c \
Lines 25-41 Link Here
25	if HDF_BUILD_FORTRAN	25	if HDF_BUILD_FORTRAN
26		26
27	if HDF_BUILD_XDR	27	if HDF_BUILD_XDR
28	libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)	28	libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES) $(XDRSOURCES)
29	else	29	else
30	libmfhdf_a_SOURCES = $(CSOURCES) $(FSOURCES)	30	libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
31	endif	31	endif
32		32
33	else	33	else
34		34
35	if HDF_BUILD_XDR	35	if HDF_BUILD_XDR
36	libmfhdf_a_SOURCES = $(CSOURCES) $(XDRSOURCES)	36	libmfhdf_la_SOURCES = $(CSOURCES) $(XDRSOURCES)
37	else	37	else
38	libmfhdf_a_SOURCES = $(CSOURCES)	38	libmfhdf_la_SOURCES = $(CSOURCES)
39	endif	39	endif
40		40
41	endif	41	endif

Lines 21-40 Link Here

(-)hdf4.2r0.orig/hdf/test/Makefile.am (-6 / +6 lines)
21	mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \	21	mgr.c nbit.c rig.c sdmms.c sdnmms.c sdstr.c slab.c tbv.c \
22	testhdf.c tree.c tszip.c tvattr.c tvset.c tvsfpack.c \	22	testhdf.c tree.c tszip.c tvattr.c tvset.c tvsfpack.c \
23	vers.c	23	vers.c
24	testhdf_LDADD = ../src/libdf.a	24	testhdf_LDADD = ../src/libdf.la
25	testhdf_DEPENDENCIES = testdir ../src/libdf.a	25	testhdf_DEPENDENCIES = testdir ../src/libdf.la
26		26
27	if HDF_BUILD_FORTRAN	27	if HDF_BUILD_FORTRAN
28	fortest_SOURCES = fortest.c	28	fortest_SOURCES = fortest.c
29	fortest_LDADD = ../src/libdf.a	29	fortest_LDADD = ../src/libdf.la
30	fortest_DEPENDENCIES = testdir fortestF ../src/libdf.a	30	fortest_DEPENDENCIES = testdir fortestF ../src/libdf.la
31		31
32	fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f \	32	fortestF_SOURCES = forsupff.f forsupf.c fortestF.f manf.f mgrf.f slabwf.f \
33	t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f \	33	t24f.f tanf.f tanfilef.f tpf.f tr8f.f tsdmmsf.f \
34	tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \	34	tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
35	tvattrf.f tvsetf.f	35	tvattrf.f tvsetf.f
36	fortestF_LDADD = ../src/libdf.a	36	fortestF_LDADD = ../src/libdf.la
37	fortestF_DEPENDENCIES = testdir ../src/libdf.a	37	fortestF_DEPENDENCIES = testdir ../src/libdf.la
38	endif	38	endif
39		39
40	testdir:	40	testdir:

Lines 19-31 Link Here

(-)hdf4.2r0.orig/mfhdf/fortran/Makefile.am (-4 / +4 lines)
19		19
20	ftest_SOURCES = ftest.f	20	ftest_SOURCES = ftest.f
21	ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \	21	ftest_LDADD = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
22	../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	22	../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
23	ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \	23	ftest_DEPENDENCIES = $(top_builddir)/hdf/test/forsupff.o $(top_builddir)/hdf/test/forsupf.o \
24	$(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	24	$(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
25		25
26	hdftest_SOURCES = hdftest.f	26	hdftest_SOURCES = hdftest.f
27	hdftest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	27	hdftest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
28	hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	28	hdftest_DEPENDENCIES = testdir $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
29		29
30	testdir:	30	testdir:
31	-mkdir testdir	31	-mkdir testdir

Lines 17-24 Link Here

(-)hdf4.2r0.orig/mfhdf/hdfimport/Makefile.am (-4 / +4 lines)
17	bin_PROGRAMS = hdfimport	17	bin_PROGRAMS = hdfimport
18		18
19	hdfimport_SOURCES = hdfimport.c	19	hdfimport_SOURCES = hdfimport.c
20	hdfimport_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	20	hdfimport_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
21	hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	21	hdfimport_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
22		22
23	#############################################################################	23	#############################################################################
24	## Testing -- Here there be dragons. ##	24	## Testing -- Here there be dragons. ##
Lines 28-35 Link Here
28	check_SCRIPTS = testutil.sh	28	check_SCRIPTS = testutil.sh
29		29
30	hdfimporttest_SOURCES = hdfimporttest.c	30	hdfimporttest_SOURCES = hdfimporttest.c
31	hdfimporttest_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	31	hdfimporttest_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
32	hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	32	hdfimporttest_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
33		33
34	check: hdfimporttest	34	check: hdfimporttest
35	@$(SHELL) ./testutil.sh	35	@$(SHELL) ./testutil.sh

Lines 20-27 Link Here

(-)hdf4.2r0.orig/mfhdf/hdiff/Makefile.am (-4 / +4 lines)
20	hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \	20	hdiff_SOURCES = hdiff.c hdiff_array.c hdiff_gr.c hdiff_list.c hdiff_main.c \
21	hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \	21	hdiff_mattbl.c hdiff_gattr.c hdiff_misc.c hdiff_sds.c \
22	hdiff_table.c hdiff_vs.c	22	hdiff_table.c hdiff_vs.c
23	hdiff_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	23	hdiff_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
24	hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	24	hdiff_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
25		25
26	#############################################################################	26	#############################################################################
27	## Testing ##	27	## Testing ##
Lines 32-39 Link Here
32	noinst_PROGRAMS = hdifftst	32	noinst_PROGRAMS = hdifftst
33		33
34	hdifftst_SOURCES = hdifftst.c	34	hdifftst_SOURCES = hdifftst.c
35	hdifftst_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a @LIBS@	35	hdifftst_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la @LIBS@
36	hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	36	hdifftst_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
37		37
38	check: hdifftst	38	check: hdifftst
39	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh	39	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/testhdiff.sh

Lines 22-29 Link Here

(-)hdf4.2r0.orig/mfhdf/hrepack/Makefile.am (-6 / +6 lines)
22	hrepack_opttable.c hrepack_pal.c hrepack_parse.c \	22	hrepack_opttable.c hrepack_pal.c hrepack_parse.c \
23	hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \	23	hrepack_sds.c hrepack_sdutil.c hrepack_utils.c \
24	hrepack_vg.c hrepack_vs.c	24	hrepack_vg.c hrepack_vs.c
25	hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a	25	hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
26	hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	26	hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
27		27
28	#############################################################################	28	#############################################################################
29	## Testing -- Here there be dragons. ##	29	## Testing -- Here there be dragons. ##
Lines 43-54 Link Here
43	../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \	43	../hdiff/hdiff_mattbl.c ../hdiff/hdiff_misc.c \
44	../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \	44	../hdiff/hdiff_sds.c ../hdiff/hdiff_table.c \
45	../hdiff/hdiff_vs.c	45	../hdiff/hdiff_vs.c
46	test_hrepack_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a	46	test_hrepack_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
47	test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	47	test_hrepack_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
48		48
49	hrepack_check_SOURCES = hrepack_check.c	49	hrepack_check_SOURCES = hrepack_check.c
50	hrepack_check_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a	50	hrepack_check_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
51	hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.a ../libsrc/libmfhdf.a	51	hrepack_check_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
52		52
53	check: test_hrepack	53	check: test_hrepack
54	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh	54	@srcdir="$(srcdir)" $(SHELL) $(srcdir)/test_hrepack.sh