diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/gifconv/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5dump/Makefile.in | 2 | ||||
| -rwxr-xr-x | tools/h5import/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5jam/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5ls/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/h5repack/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/lib/Makefile.in | 9 | ||||
| -rw-r--r-- | tools/misc/Makefile.in | 2 |
10 files changed, 16 insertions, 13 deletions
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 |