diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-02-03 21:59:40 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-02-03 21:59:40 (GMT) |
| commit | db2575baa91049ad4d5e5ea623ff1161443d1af2 (patch) | |
| tree | c4169fb6dc29ddbcd8bc356afb98b708c96374dd | |
| parent | 51863989304a051ac6306c8c49c34d70a4cf992e (diff) | |
| download | hdf5-db2575baa91049ad4d5e5ea623ff1161443d1af2.zip hdf5-db2575baa91049ad4d5e5ea623ff1161443d1af2.tar.gz hdf5-db2575baa91049ad4d5e5ea623ff1161443d1af2.tar.bz2 | |
[svn-r9930]
Purpose:
Bug fix
Description:
Parallel builds were breaking in tools/lib
Solution:
talign didn't realize it depended on libh5tools.la because its
dependencies listed the full path (../../tools/lib/libh5tools.la).
Changed this, and made similar changes in a couple of other
directories.
This checkin should also add the --foreign flag to every Makefile.in
Platforms tested:
sleipnir (minor change)
49 files changed, 102 insertions, 104 deletions
diff --git a/Makefile.in b/Makefile.in index 592c18f..9efee11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -242,7 +242,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + $(AUTOMAKE) --foreign Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) diff --git a/c++/Makefile.in b/c++/Makefile.in index d65d69e..43cac76 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -231,7 +231,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu c++/Makefile + $(AUTOMAKE) --foreign c++/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index fd7c650..638cec6 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -249,7 +249,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu c++/examples/Makefile + $(AUTOMAKE) --foreign c++/examples/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index af4ea86..ecb530d 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -315,7 +315,7 @@ all: all-am .SUFFIXES: .cpp .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu c++/src/Makefile + $(AUTOMAKE) --foreign c++/src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) h5c++: $(top_builddir)/config.status h5c++.in diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 9863440..13ffb33 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -275,7 +275,7 @@ all: all-am .SUFFIXES: .cpp .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu c++/test/Makefile + $(AUTOMAKE) --foreign c++/test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/Makefile.in b/doc/Makefile.in index 17bbce4..5bee7b4 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -211,7 +211,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in index 057c621..a2d4767 100644 --- a/doc/html/ADGuide/Makefile.in +++ b/doc/html/ADGuide/Makefile.in @@ -205,7 +205,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/ADGuide/Makefile + $(AUTOMAKE) --foreign doc/html/ADGuide/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in index fdd3087..2eb3d1a 100644 --- a/doc/html/Graphics/Makefile.in +++ b/doc/html/Graphics/Makefile.in @@ -203,7 +203,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Graphics/Makefile + $(AUTOMAKE) --foreign doc/html/Graphics/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in index 7c60248..630ee27 100644 --- a/doc/html/Intro/Makefile.in +++ b/doc/html/Intro/Makefile.in @@ -203,7 +203,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Intro/Makefile + $(AUTOMAKE) --foreign doc/html/Intro/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index ab07a97..b0e0dbd 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -237,7 +237,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Makefile + $(AUTOMAKE) --foreign doc/html/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in index 4c766ce..c5c2529 100644 --- a/doc/html/PSandPDF/Makefile.in +++ b/doc/html/PSandPDF/Makefile.in @@ -198,7 +198,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/PSandPDF/Makefile + $(AUTOMAKE) --foreign doc/html/PSandPDF/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in index be8c15b..a2afa89 100644 --- a/doc/html/TechNotes/Makefile.in +++ b/doc/html/TechNotes/Makefile.in @@ -212,7 +212,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/TechNotes/Makefile + $(AUTOMAKE) --foreign doc/html/TechNotes/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in index f52472d..0f46cc0 100644 --- a/doc/html/Tutor/Graphics/Makefile.in +++ b/doc/html/Tutor/Graphics/Makefile.in @@ -211,7 +211,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Tutor/Graphics/Makefile + $(AUTOMAKE) --foreign doc/html/Tutor/Graphics/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in index cd0b0d2..a5c01e5 100644 --- a/doc/html/Tutor/Makefile.in +++ b/doc/html/Tutor/Makefile.in @@ -218,7 +218,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Tutor/Makefile + $(AUTOMAKE) --foreign doc/html/Tutor/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index a2e9047..20adbd3 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -226,7 +226,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/Tutor/examples/Makefile + $(AUTOMAKE) --foreign doc/html/Tutor/examples/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in index 59dae59..7019895 100644 --- a/doc/html/cpplus/Makefile.in +++ b/doc/html/cpplus/Makefile.in @@ -203,7 +203,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/cpplus/Makefile + $(AUTOMAKE) --foreign doc/html/cpplus/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in index e479405..38112b8 100644 --- a/doc/html/ed_libs/Makefile.in +++ b/doc/html/ed_libs/Makefile.in @@ -207,7 +207,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/ed_libs/Makefile + $(AUTOMAKE) --foreign doc/html/ed_libs/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in index 4ae7ab6..d77c889 100644 --- a/doc/html/ed_styles/Makefile.in +++ b/doc/html/ed_styles/Makefile.in @@ -206,7 +206,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/ed_styles/Makefile + $(AUTOMAKE) --foreign doc/html/ed_styles/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in index 0582bd8..6593306 100644 --- a/doc/html/fortran/Makefile.in +++ b/doc/html/fortran/Makefile.in @@ -203,7 +203,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence-doc.am $(top_srcdir)/config/commence.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/html/fortran/Makefile + $(AUTOMAKE) --foreign doc/html/fortran/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/examples/Makefile.in b/examples/Makefile.in index 72a55fb..220c0da 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -257,7 +257,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/Makefile + $(AUTOMAKE) --foreign examples/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/fortran/Makefile.in b/fortran/Makefile.in index c6f5c394..688ffab 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -239,7 +239,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu fortran/Makefile + $(AUTOMAKE) --foreign fortran/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index c639821..62ad52c 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -250,7 +250,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu fortran/examples/Makefile + $(AUTOMAKE) --foreign fortran/examples/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index f3fac18..05b5287 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -307,7 +307,7 @@ all: all-am .SUFFIXES: .c .f90 .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu fortran/src/Makefile + $(AUTOMAKE) --foreign fortran/src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) h5fc: $(top_builddir)/config.status h5fc.in diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 454e431..2aece4e 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -36,8 +36,6 @@ libh5test_fortran_la_SOURCES=fortranlib_test.f90 tH5F.f90 tH5D.f90 \ libh5test_fortran_la_LDFLAGS=-static -##noinst_HEADERS=H5f90proto.h - # Source files are used for both the library and fortranlib_test. # Automake will complain about this without the following workaround. fortranlib_test_FFLAGS=$(AM_FFLAGS) @@ -53,7 +51,7 @@ fflush2_SOURCES=fflush2.f90 # The fortran test library depends on the main fortran library. # The tests depend on both fortran libraries and both main libraries. LIBADD=$(LIBH5TEST) $(LIBHDF5) $(LIBH5F) -LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) +LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) # Temporary files MOSTLYCLEANFILES=*.h5 *.tmp diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index be7d370..dba8e7e 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -234,7 +234,7 @@ fflush2_SOURCES = fflush2.f90 # The fortran test library depends on the main fortran library. # The tests depend on both fortran libraries and both main libraries. LIBADD = $(LIBH5TEST) $(LIBHDF5) $(LIBH5F) -LDADD = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) +LDADD = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) # Temporary files MOSTLYCLEANFILES = *.h5 *.tmp @@ -267,7 +267,7 @@ check_PROGRAMS = fortranlib_test$(EXEEXT) fflush1$(EXEEXT) \ am_fflush1_OBJECTS = fflush1.$(OBJEXT) fflush1_OBJECTS = $(am_fflush1_OBJECTS) fflush1_LDADD = $(LDADD) -fflush1_DEPENDENCIES = $(top_builddir)/fortran/test/libh5test_fortran.la \ +fflush1_DEPENDENCIES = libh5test_fortran.la \ $(top_builddir)/test/libh5test.la \ $(top_builddir)/fortran/src/libhdf5_fortran.la \ $(top_builddir)/src/libhdf5.la @@ -275,7 +275,7 @@ fflush1_LDFLAGS = am_fflush2_OBJECTS = fflush2.$(OBJEXT) fflush2_OBJECTS = $(am_fflush2_OBJECTS) fflush2_LDADD = $(LDADD) -fflush2_DEPENDENCIES = $(top_builddir)/fortran/test/libh5test_fortran.la \ +fflush2_DEPENDENCIES = libh5test_fortran.la \ $(top_builddir)/test/libh5test.la \ $(top_builddir)/fortran/src/libhdf5_fortran.la \ $(top_builddir)/src/libhdf5.la @@ -292,8 +292,7 @@ am_fortranlib_test_OBJECTS = fortranlib_test-fortranlib_test.$(OBJEXT) \ fortranlib_test-t.$(OBJEXT) fortranlib_test_OBJECTS = $(am_fortranlib_test_OBJECTS) fortranlib_test_LDADD = $(LDADD) -fortranlib_test_DEPENDENCIES = \ - $(top_builddir)/fortran/test/libh5test_fortran.la \ +fortranlib_test_DEPENDENCIES = libh5test_fortran.la \ $(top_builddir)/test/libh5test.la \ $(top_builddir)/fortran/src/libhdf5_fortran.la \ $(top_builddir)/src/libhdf5.la @@ -331,7 +330,7 @@ all: all-am .SUFFIXES: .c .f90 .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu fortran/test/Makefile + $(AUTOMAKE) --foreign fortran/test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 57cd9a1..4949c66 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -264,7 +264,7 @@ all: all-am .SUFFIXES: .f90 .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu fortran/testpar/Makefile + $(AUTOMAKE) --foreign fortran/testpar/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/hl/Makefile.in b/hl/Makefile.in index e217641..b616f06 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -228,7 +228,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu hl/Makefile + $(AUTOMAKE) --foreign hl/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 8b8112a..1eb3761 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -226,7 +226,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu hl/fortran/Makefile + $(AUTOMAKE) --foreign hl/fortran/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index a6fddf0..9824a38 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -261,7 +261,7 @@ all: all-am .SUFFIXES: .c .f90 .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu hl/fortran/src/Makefile + $(AUTOMAKE) --foreign hl/fortran/src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 1e2bca3..a0cd2b4 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -267,7 +267,7 @@ all: all-am .SUFFIXES: .f90 .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu hl/fortran/test/Makefile + $(AUTOMAKE) --foreign hl/fortran/test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index c635d2d..62059a8 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -253,7 +253,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu hl/src/Makefile + $(AUTOMAKE) --foreign hl/src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) libLTLIBRARIES_INSTALL = $(INSTALL) diff --git a/hl/test/Makefile.am b/hl/test/Makefile.am index f038f24..50dce95 100644 --- a/hl/test/Makefile.am +++ b/hl/test/Makefile.am @@ -13,8 +13,6 @@ include $(top_srcdir)/config/commence.am # Add include directories to C preprocessor flags AM_CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -##LIBHDF5_HL=$(top_builddir)/hl/src/libhdf5_hl.la - # The tests depend on the hdf5 and hdf5_hl libraries LDADD=$(LIBH5_HL) $(LIBHDF5) diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 9b12fc0..c12e43e 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -272,7 +272,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu hl/test/Makefile + $(AUTOMAKE) --foreign hl/test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 0d58f52..884b7ba 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -274,7 +274,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/gifconv/Makefile + $(AUTOMAKE) --foreign tools/gifconv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/perform/Makefile.in b/perform/Makefile.in index 2d637f1..ae13d7d 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -316,7 +316,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu perform/Makefile + $(AUTOMAKE) --foreign perform/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/src/Makefile.in b/src/Makefile.in index b42082d..0d69855 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -410,7 +410,7 @@ all: H5config.h .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/test/Makefile.am b/test/Makefile.am index 0a1a243..06dc69e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -54,7 +54,7 @@ libh5test_la_LIBADD=$(LIBHDF5) libh5test_la_LDFLAGS=-static # Use libhd5test.la to compile all of the tests -LDADD=${LIBHDF5} libh5test.la +LDADD=libh5test.la $(LIBHDF5) # List the source files for tests that have more than one ttsafe_SOURCES=ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c \ diff --git a/test/Makefile.in b/test/Makefile.in index 299cd79..243ed00 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -234,7 +234,7 @@ libh5test_la_LIBADD = $(LIBHDF5) libh5test_la_LDFLAGS = -static # Use libhd5test.la to compile all of the tests -LDADD = ${LIBHDF5} libh5test.la +LDADD = libh5test.la $(LIBHDF5) # List the source files for tests that have more than one ttsafe_SOURCES = ttsafe.c ttsafe_dcreate.c ttsafe_error.c ttsafe_cancel.c \ @@ -304,197 +304,197 @@ check_PROGRAMS = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \ big_SOURCES = big.c big_OBJECTS = big.$(OBJEXT) big_LDADD = $(LDADD) -big_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +big_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la big_LDFLAGS = bittests_SOURCES = bittests.c bittests_OBJECTS = bittests.$(OBJEXT) bittests_LDADD = $(LDADD) -bittests_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +bittests_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la bittests_LDFLAGS = btree2_SOURCES = btree2.c btree2_OBJECTS = btree2.$(OBJEXT) btree2_LDADD = $(LDADD) -btree2_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +btree2_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la btree2_LDFLAGS = cache_SOURCES = cache.c cache_OBJECTS = cache.$(OBJEXT) cache_LDADD = $(LDADD) -cache_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +cache_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la cache_LDFLAGS = cmpd_dset_SOURCES = cmpd_dset.c cmpd_dset_OBJECTS = cmpd_dset.$(OBJEXT) cmpd_dset_LDADD = $(LDADD) -cmpd_dset_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +cmpd_dset_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la cmpd_dset_LDFLAGS = dangle_SOURCES = dangle.c dangle_OBJECTS = dangle.$(OBJEXT) dangle_LDADD = $(LDADD) -dangle_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +dangle_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la dangle_LDFLAGS = dsets_SOURCES = dsets.c dsets_OBJECTS = dsets.$(OBJEXT) dsets_LDADD = $(LDADD) -dsets_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +dsets_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la dsets_LDFLAGS = dtransform_SOURCES = dtransform.c dtransform_OBJECTS = dtransform.$(OBJEXT) dtransform_LDADD = $(LDADD) -dtransform_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +dtransform_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la dtransform_LDFLAGS = dtypes_SOURCES = dtypes.c dtypes_OBJECTS = dtypes.$(OBJEXT) dtypes_LDADD = $(LDADD) -dtypes_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +dtypes_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la dtypes_LDFLAGS = enum_SOURCES = enum.c enum_OBJECTS = enum.$(OBJEXT) enum_LDADD = $(LDADD) -enum_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +enum_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la enum_LDFLAGS = err_compat_SOURCES = err_compat.c err_compat_OBJECTS = err_compat.$(OBJEXT) err_compat_LDADD = $(LDADD) -err_compat_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +err_compat_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la err_compat_LDFLAGS = error_test_SOURCES = error_test.c error_test_OBJECTS = error_test.$(OBJEXT) error_test_LDADD = $(LDADD) -error_test_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +error_test_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la error_test_LDFLAGS = extend_SOURCES = extend.c extend_OBJECTS = extend.$(OBJEXT) extend_LDADD = $(LDADD) -extend_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +extend_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la extend_LDFLAGS = external_SOURCES = external.c external_OBJECTS = external.$(OBJEXT) external_LDADD = $(LDADD) -external_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +external_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la external_LDFLAGS = file_handle_SOURCES = file_handle.c file_handle_OBJECTS = file_handle.$(OBJEXT) file_handle_LDADD = $(LDADD) -file_handle_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +file_handle_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la file_handle_LDFLAGS = filename_SOURCES = filename.c filename_OBJECTS = filename.$(OBJEXT) filename_LDADD = $(LDADD) -filename_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +filename_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la filename_LDFLAGS = fillval_SOURCES = fillval.c fillval_OBJECTS = fillval.$(OBJEXT) fillval_LDADD = $(LDADD) -fillval_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +fillval_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la fillval_LDFLAGS = flush1_SOURCES = flush1.c flush1_OBJECTS = flush1.$(OBJEXT) flush1_LDADD = $(LDADD) -flush1_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +flush1_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la flush1_LDFLAGS = flush2_SOURCES = flush2.c flush2_OBJECTS = flush2.$(OBJEXT) flush2_LDADD = $(LDADD) -flush2_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +flush2_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la flush2_LDFLAGS = gass_append_SOURCES = gass_append.c gass_append_OBJECTS = gass_append.$(OBJEXT) gass_append_LDADD = $(LDADD) -gass_append_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +gass_append_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la gass_append_LDFLAGS = gass_read_SOURCES = gass_read.c gass_read_OBJECTS = gass_read.$(OBJEXT) gass_read_LDADD = $(LDADD) -gass_read_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +gass_read_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la gass_read_LDFLAGS = gass_write_SOURCES = gass_write.c gass_write_OBJECTS = gass_write.$(OBJEXT) gass_write_LDADD = $(LDADD) -gass_write_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +gass_write_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la gass_write_LDFLAGS = getname_SOURCES = getname.c getname_OBJECTS = getname.$(OBJEXT) getname_LDADD = $(LDADD) -getname_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +getname_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la getname_LDFLAGS = gheap_SOURCES = gheap.c gheap_OBJECTS = gheap.$(OBJEXT) gheap_LDADD = $(LDADD) -gheap_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +gheap_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la gheap_LDFLAGS = hyperslab_SOURCES = hyperslab.c hyperslab_OBJECTS = hyperslab.$(OBJEXT) hyperslab_LDADD = $(LDADD) -hyperslab_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +hyperslab_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la hyperslab_LDFLAGS = istore_SOURCES = istore.c istore_OBJECTS = istore.$(OBJEXT) istore_LDADD = $(LDADD) -istore_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +istore_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la istore_LDFLAGS = lheap_SOURCES = lheap.c lheap_OBJECTS = lheap.$(OBJEXT) lheap_LDADD = $(LDADD) -lheap_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +lheap_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la lheap_LDFLAGS = links_SOURCES = links.c links_OBJECTS = links.$(OBJEXT) links_LDADD = $(LDADD) -links_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +links_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la links_LDFLAGS = mount_SOURCES = mount.c mount_OBJECTS = mount.$(OBJEXT) mount_LDADD = $(LDADD) -mount_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +mount_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la mount_LDFLAGS = mtime_SOURCES = mtime.c mtime_OBJECTS = mtime.$(OBJEXT) mtime_LDADD = $(LDADD) -mtime_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +mtime_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la mtime_LDFLAGS = ntypes_SOURCES = ntypes.c ntypes_OBJECTS = ntypes.$(OBJEXT) ntypes_LDADD = $(LDADD) -ntypes_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +ntypes_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la ntypes_LDFLAGS = ohdr_SOURCES = ohdr.c ohdr_OBJECTS = ohdr.$(OBJEXT) ohdr_LDADD = $(LDADD) -ohdr_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +ohdr_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la ohdr_LDFLAGS = reserved_SOURCES = reserved.c reserved_OBJECTS = reserved.$(OBJEXT) reserved_LDADD = $(LDADD) -reserved_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +reserved_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la reserved_LDFLAGS = set_extent_SOURCES = set_extent.c set_extent_OBJECTS = set_extent.$(OBJEXT) set_extent_LDADD = $(LDADD) -set_extent_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +set_extent_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la set_extent_LDFLAGS = srb_append_SOURCES = srb_append.c srb_append_OBJECTS = srb_append.$(OBJEXT) srb_append_LDADD = $(LDADD) -srb_append_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +srb_append_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la srb_append_LDFLAGS = srb_read_SOURCES = srb_read.c srb_read_OBJECTS = srb_read.$(OBJEXT) srb_read_LDADD = $(LDADD) -srb_read_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +srb_read_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la srb_read_LDFLAGS = srb_write_SOURCES = srb_write.c srb_write_OBJECTS = srb_write.$(OBJEXT) srb_write_LDADD = $(LDADD) -srb_write_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +srb_write_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la srb_write_LDFLAGS = stab_SOURCES = stab.c stab_OBJECTS = stab.$(OBJEXT) stab_LDADD = $(LDADD) -stab_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +stab_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la stab_LDFLAGS = stream_test_SOURCES = stream_test.c stream_test_OBJECTS = stream_test.$(OBJEXT) stream_test_LDADD = $(LDADD) -stream_test_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +stream_test_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la stream_test_LDFLAGS = am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \ tattr.$(OBJEXT) tconfig.$(OBJEXT) tfile.$(OBJEXT) \ @@ -505,24 +505,24 @@ am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \ tvltypes.$(OBJEXT) tvlstr.$(OBJEXT) testhdf5_OBJECTS = $(am_testhdf5_OBJECTS) testhdf5_LDADD = $(LDADD) -testhdf5_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +testhdf5_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la testhdf5_LDFLAGS = testmeta_SOURCES = testmeta.c testmeta_OBJECTS = testmeta.$(OBJEXT) testmeta_LDADD = $(LDADD) -testmeta_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +testmeta_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la testmeta_LDFLAGS = am_ttsafe_OBJECTS = ttsafe.$(OBJEXT) ttsafe_dcreate.$(OBJEXT) \ ttsafe_error.$(OBJEXT) ttsafe_cancel.$(OBJEXT) \ ttsafe_acreate.$(OBJEXT) ttsafe_OBJECTS = $(am_ttsafe_OBJECTS) ttsafe_LDADD = $(LDADD) -ttsafe_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +ttsafe_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la ttsafe_LDFLAGS = unlink_SOURCES = unlink.c unlink_OBJECTS = unlink.$(OBJEXT) unlink_LDADD = $(LDADD) -unlink_DEPENDENCIES = $(top_builddir)/src/libhdf5.la libh5test.la +unlink_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la unlink_LDFLAGS = DEFS = @DEFS@ @@ -593,7 +593,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu test/Makefile + $(AUTOMAKE) --foreign test/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/testpar/Makefile.in b/testpar/Makefile.in index cf169fa..e7ab3e9 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -291,7 +291,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu testpar/Makefile + $(AUTOMAKE) --foreign testpar/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) testph5.sh: $(top_builddir)/config.status testph5.sh.in diff --git a/tools/Makefile.in b/tools/Makefile.in index a273c2a..cab7823 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -232,7 +232,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/Makefile + $(AUTOMAKE) --foreign tools/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 0d58f52..884b7ba 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -274,7 +274,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/gifconv/Makefile + $(AUTOMAKE) --foreign tools/gifconv/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 92f2647..dea8a1a 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -280,7 +280,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/h5dump/Makefile + $(AUTOMAKE) --foreign tools/h5dump/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) testh5dump.sh: $(top_builddir)/config.status testh5dump.sh.in diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 50b50cc..cebd50d 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -275,7 +275,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/h5import/Makefile + $(AUTOMAKE) --foreign tools/h5import/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 38ae399..7cb049f 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -293,7 +293,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/h5jam/Makefile + $(AUTOMAKE) --foreign tools/h5jam/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) testh5jam.sh: $(top_builddir)/config.status testh5jam.sh.in diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 8510e7c..4b3ba28 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -264,7 +264,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/h5ls/Makefile + $(AUTOMAKE) --foreign tools/h5ls/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 50d03c1..5da78ff 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -324,7 +324,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/h5repack/Makefile + $(AUTOMAKE) --foreign tools/h5repack/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) h5repack.sh: $(top_builddir)/config.status h5repack.sh.in diff --git a/tools/lib/Makefile.am b/tools/lib/Makefile.am index 0c34273..a634887 100644 --- a/tools/lib/Makefile.am +++ b/tools/lib/Makefile.am @@ -38,7 +38,9 @@ LIBADD=$(LIBHDF5) TEST_PROG=talign check_PROGRAMS=$(TEST_PROG) -LDADD=$(LIBH5TOOLS) $(LIBHDF5) +# Name libh5tools.la so that dependencies work out. Automake knows how +# to build 'libh5tools.la', but not '../../tools/lib/libh5tools.la'. +LDADD=libh5tools.la $(LIBHDF5) include $(top_srcdir)/config/conclude.am diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 3c6f426..b8d03e4 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -220,7 +220,9 @@ LIBADD = $(LIBHDF5) TEST_PROG = talign check_PROGRAMS = $(TEST_PROG) -LDADD = $(LIBH5TOOLS) $(LIBHDF5) +# Name libh5tools.la so that dependencies work out. Automake knows how +# to build 'libh5tools.la', but not '../../tools/lib/libh5tools.la'. +LDADD = libh5tools.la $(LIBHDF5) # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., @@ -250,8 +252,7 @@ check_PROGRAMS = talign$(EXEEXT) talign_SOURCES = talign.c talign_OBJECTS = talign.$(OBJEXT) talign_LDADD = $(LDADD) -talign_DEPENDENCIES = $(top_builddir)/tools/lib/libh5tools.la \ - $(top_builddir)/src/libhdf5.la +talign_DEPENDENCIES = libh5tools.la $(top_builddir)/src/libhdf5.la talign_LDFLAGS = DEFS = @DEFS@ @@ -290,7 +291,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/lib/Makefile + $(AUTOMAKE) --foreign tools/lib/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index f76b769..3362269 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -294,7 +294,7 @@ all: all-am .SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/misc/Makefile + $(AUTOMAKE) --foreign tools/misc/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) h5cc: $(top_builddir)/config.status h5cc.in |