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 /tools/lib | |
| 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 'tools/lib')
| -rw-r--r-- | tools/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/lib/Makefile.in | 9 |
2 files changed, 8 insertions, 5 deletions
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) |