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 /fortran/test | |
| 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)
Diffstat (limited to 'fortran/test')
| -rw-r--r-- | fortran/test/Makefile.am | 4 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 11 |
2 files changed, 6 insertions, 9 deletions
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) |