diff options
56 files changed, 367 insertions, 724 deletions
diff --git a/Makefile.am b/Makefile.am index 46c9291..af641c0 100755 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,20 @@ # # Top-level HDF5 Makefile(.in) +# pmake has issues if variables are undefined. Solve this problem in +# top-level Makefile by defining all variables it complains about. +# Configure should set AM_MAKEFLAGS to -V to solve this problem in +# subdirectories. +# NOTE: This means that invoking pmake in a subdirectory will not work. +CONFIG_STATUS_DEPENDENCIES= +TAGS_DEPENDENCIES= +TAGS_FILES= +HEADERS= +SOURCES= +TEXINFOS= +EXTRA_DIST= +LISP= + include $(top_srcdir)/config/commence.am # Define subdirectories to build. @@ -35,17 +49,27 @@ include $(top_srcdir)/config/commence.am # are cleaned as well). # Note that `make clean' will not affect the examples or doc directories. +# Conditionals. These conditionals are defined during configure +# Define each variable to empty if it is not used to placate pmake if BUILD_PARALLEL_CONDITIONAL TESTPARALLEL_DIR =testpar +else + TESTPARALLEL_DIR= endif if BUILD_CXX_CONDITIONAL CXX_DIR =c++ +else + CXX_DIR= endif if BUILD_FORTRAN_CONDITIONAL FORTRAN_DIR =fortran +else + FORTRAN_DIR= endif if BUILD_HDF5_HL_CONDITIONAL HDF5_HL_DIR =hl +else + HDF5_HL_DIR= endif SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \ @@ -63,17 +87,17 @@ test _test: check lib progs: @@SETX@; for d in $(SUBDIRS); do \ if test $$d != .; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done # Make all and make tests also create tests in perform directory all-local: - cd perform && $(MAKE) all + cd perform && $(MAKE) $(AM_MAKEFLAGS) all tests: @@SETX@; for d in $(SUBDIRS) perform; do \ if test $$d != .; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -82,47 +106,47 @@ tests: clean-local: @@SETX@; for d in docs examples perform; do \ if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) clean) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ fi; \ done mostlyclean-local: @@SETX@; for d in docs examples perform; do \ if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) mostlyclean) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; \ done # 'make install-all' also installs docs and examples install-all: - $(MAKE) install - $(MAKE) install-doc + $(MAKE) $(AM_MAKEFLAGS) install + $(MAKE) $(AM_MAKEFLAGS) install-doc uninstall-all: - $(MAKE) uninstall - $(MAKE) uninstall-doc + $(MAKE) $(AM_MAKEFLAGS) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall-doc # Install examples in this directory and recursively install-examples uninstall-examples: @@SETX@; for d in examples $(HDF5_INTERFACES); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ done # Install documentation and examples install-doc: - $(MAKE) install-examples - (cd doc && $(MAKE) $@) || exit 1; + $(MAKE) $(AM_MAKEFLAGS) install-examples + (cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; uninstall-doc: - $(MAKE) uninstall-examples - (cd doc && $(MAKE) $@) || exit 1; + $(MAKE) $(AM_MAKEFLAGS) uninstall-examples + (cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # `make check-install' or `make installcheck' checks that examples can # be successfully built check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Don't include conclude.am in root Makefile; tests target needs to # recurse into perform directory as well as reguar subdirs. diff --git a/Makefile.in b/Makefile.in index 9efee11..b8c55b9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,12 +32,6 @@ # each subdirectory manually. # # Top-level HDF5 Makefile(.in) - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -97,6 +91,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -172,6 +167,20 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ +# pmake has issues if variables are undefined. Solve this problem in +# top-level Makefile by defining all variables it complains about. +# Configure should set AM_MAKEFLAGS to -V to solve this problem in +# subdirectories. +# NOTE: This means that invoking pmake in a subdirectory will not work. +CONFIG_STATUS_DEPENDENCIES = +TAGS_DEPENDENCIES = +TAGS_FILES = +HEADERS = +SOURCES = +TEXINFOS = +EXTRA_DIST = +LISP = + # Shell commands used in Makefiles RM = rm -f CP = cp @@ -197,7 +206,6 @@ H5FC_PP = $(bindir)/h5pfc F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ - # Define subdirectories to build. # Add this directory to SUBDIRS so that examples get built after tools # but before examples in extra interfaces (c++ and fortran). @@ -205,10 +213,17 @@ F9XMODFLAG = @F9XMODFLAG@ # directories that are only conditionally built (so that their Makefiles # are cleaned as well). # Note that `make clean' will not affect the examples or doc directories. + +# Conditionals. These conditionals are defined during configure +# Define each variable to empty if it is not used to placate pmake @BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar +@BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = @BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++ +@BUILD_CXX_CONDITIONAL_FALSE@CXX_DIR = @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran +@BUILD_FORTRAN_CONDITIONAL_FALSE@FORTRAN_DIR = @BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl +@BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR = SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \ $(HDF5_HL_DIR) @@ -558,17 +573,17 @@ test _test: check lib progs: @@SETX@; for d in $(SUBDIRS); do \ if test $$d != .; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done # Make all and make tests also create tests in perform directory all-local: - cd perform && $(MAKE) all + cd perform && $(MAKE) $(AM_MAKEFLAGS) all tests: @@SETX@; for d in $(SUBDIRS) perform; do \ if test $$d != .; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -577,47 +592,47 @@ tests: clean-local: @@SETX@; for d in docs examples perform; do \ if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) clean) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ fi; \ done mostlyclean-local: @@SETX@; for d in docs examples perform; do \ if test -f $$d/Makefile; then \ - (cd $$d && $(MAKE) mostlyclean) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; \ done # 'make install-all' also installs docs and examples install-all: - $(MAKE) install - $(MAKE) install-doc + $(MAKE) $(AM_MAKEFLAGS) install + $(MAKE) $(AM_MAKEFLAGS) install-doc uninstall-all: - $(MAKE) uninstall - $(MAKE) uninstall-doc + $(MAKE) $(AM_MAKEFLAGS) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall-doc # Install examples in this directory and recursively install-examples uninstall-examples: @@SETX@; for d in examples $(HDF5_INTERFACES); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ done # Install documentation and examples install-doc: - $(MAKE) install-examples - (cd doc && $(MAKE) $@) || exit 1; + $(MAKE) $(AM_MAKEFLAGS) install-examples + (cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; uninstall-doc: - $(MAKE) uninstall-examples - (cd doc && $(MAKE) $@) || exit 1; + $(MAKE) $(AM_MAKEFLAGS) uninstall-examples + (cd doc && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # `make check-install' or `make installcheck' checks that examples can # be successfully built check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Don't include conclude.am in root Makefile; tests target needs to # recurse into perform directory as well as reguar subdirs. diff --git a/c++/Makefile.am b/c++/Makefile.am index c4d6209..c4e1c44 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -24,23 +24,23 @@ DIST_SUBDIRS = $(SUBDIRS) examples # Clean and mostlyclean need to recurse into examples directory clean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) clean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ fi; mostlyclean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) mostlyclean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; # Install examples install-examples uninstall-examples: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Check that examples can be successfully built check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; include $(top_srcdir)/config/conclude.am diff --git a/c++/Makefile.in b/c++/Makefile.in index 43cac76..eac374e 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -29,18 +29,6 @@ # # Top-level HDF5-C++ Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -469,24 +458,24 @@ uninstall-info: uninstall-info-recursive # Clean and mostlyclean need to recurse into examples directory clean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) clean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ fi; mostlyclean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) mostlyclean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; # Install examples install-examples uninstall-examples: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Check that examples can be successfully built check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. @@ -495,10 +484,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -605,7 +594,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 638cec6..f7bd9b1 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Examples Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -422,10 +411,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -532,7 +521,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index ecb530d..0d7f370 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -29,18 +29,6 @@ # # HDF5-C++ Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -610,10 +599,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -720,7 +709,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 13ffb33..f1d8a3d 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -29,18 +29,6 @@ # # HDF5-C++ Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -487,10 +476,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -597,7 +586,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/config/commence-doc.am b/config/commence-doc.am index 48136af..2d746a1 100644 --- a/config/commence-doc.am +++ b/config/commence-doc.am @@ -1,3 +1,4 @@ +## config/commence-doc.am ## This file supplies Makefile.am files in the doc directory (and subdirectories) ## with the rules they need. @@ -9,13 +10,13 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall diff --git a/config/commence.am b/config/commence.am index 5c8339c..2125b92 100644 --- a/config/commence.am +++ b/config/commence.am @@ -1,8 +1,6 @@ -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- +## config/commence.am +## Textually included in the beginning of every HDF5 Makefile.am +## Contains definitions, etc. used across multiple Makefiles. # Shell commands used in Makefiles RM=rm -f diff --git a/config/conclude.am b/config/conclude.am index f712294..19b61f5 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -1,8 +1,6 @@ -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- +## config/conclude.am +## Textually included at the end of most HDF5 Makefiles.am. +## Contains build rules. # 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., @@ -23,10 +21,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -133,6 +131,6 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done @@ -472,7 +472,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F FFLAGS F9XSUFFIXFLAG FSEARCH_DIRS F9X F9XMODFLAG F9XMODEXT FC F77 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP LT_STATIC_EXEC PERL AR LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS DEFAULT_LIBS HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F FFLAGS F9XSUFFIXFLAG FSEARCH_DIRS F9X F9XMODFLAG F9XMODEXT FC F77 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP LT_STATIC_EXEC PERL AR LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB BUILD_PDB2HDF BUILD_PDB2HDF_CONDITIONAL_TRUE BUILD_PDB2HDF_CONDITIONAL_FALSE PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -9874,6 +9874,27 @@ echo "$as_me: error: ${MAKE-make} requires the build and source directories to b done rm maketest + AM_MAKEFLAGS="" + +echo "$as_me:$LINENO: checking whether make will build with undefined variables" >&5 +echo $ECHO_N "checking whether make will build with undefined variables... $ECHO_C" >&6 + + cat >maketest <<EOF +foo: \$(UNDEFINED) \$(UNDEFINED2) + @echo \$(UNDEFINED3) works +EOF + + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no, setting -V flag" >&5 +echo "${ECHO_T}no, setting -V flag" >&6 + AM_MAKEFLAGS="\-V" + fi + +rm maketest + echo "$as_me:$LINENO: checking for production mode" >&5 echo $ECHO_N "checking for production mode... $ECHO_C" >&6 # Check whether --enable-production or --disable-production was given. @@ -40575,6 +40596,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t +s,@AM_MAKEFLAGS@,$AM_MAKEFLAGS,;t t s,@USE_FILTER_DEFLATE@,$USE_FILTER_DEFLATE,;t t s,@USE_FILTER_SZIP@,$USE_FILTER_SZIP,;t t s,@SSL@,$SSL,;t t diff --git a/configure.in b/configure.in index 9a889a7..296c955 100644 --- a/configure.in +++ b/configure.in @@ -560,6 +560,28 @@ done rm maketest dnl ---------------------------------------------------------------------- +dnl pmake will throw an error if variables are undefined in a Makefile. +dnl These errors can be changed to warnings using the -V flag. +dnl +AC_SUBST(AM_MAKEFLAGS) AM_MAKEFLAGS="" + +AC_MSG_CHECKING([whether make will build with undefined variables]) + + cat >maketest <<EOF +foo: \$(UNDEFINED) \$(UNDEFINED2) + @echo \$(UNDEFINED3) works +EOF + + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no, setting -V flag]) + AM_MAKEFLAGS="\-V" + fi + +rm maketest + +dnl ---------------------------------------------------------------------- dnl Production flags? Save the value in $CONFIG_MODE so we have it for dnl the record. dnl diff --git a/doc/Makefile.in b/doc/Makefile.in index 5bee7b4..ee156e8 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -25,12 +25,6 @@ # reinvokes make in the various subdirectories. # You can alternatively invoke make from each subdirectory manually. # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -90,6 +84,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -450,16 +445,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Don't include conclude, since the docs directory doesn't need to know how to # build anything. diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in index a2d4767..273fba7 100644 --- a/doc/html/ADGuide/Makefile.in +++ b/doc/html/ADGuide/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -349,16 +344,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in index 2eb3d1a..3da3245 100644 --- a/doc/html/Graphics/Makefile.in +++ b/doc/html/Graphics/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -347,16 +342,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in index 630ee27..7c18fe5 100644 --- a/doc/html/Intro/Makefile.in +++ b/doc/html/Intro/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -347,16 +342,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index b0e0dbd..f81b9a7 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -25,12 +25,6 @@ # reinvokes make in the various subdirectories. # You can alternatively invoke make from each subdirectory manually. # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -90,6 +84,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -497,16 +492,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in index c5c2529..4234eb8 100644 --- a/doc/html/PSandPDF/Makefile.in +++ b/doc/html/PSandPDF/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -322,16 +317,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # This makefile does nothing; there are no files to install. # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in index a2afa89..85b388f 100644 --- a/doc/html/TechNotes/Makefile.in +++ b/doc/html/TechNotes/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -356,16 +351,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in index 0f46cc0..750ba64 100644 --- a/doc/html/Tutor/Graphics/Makefile.in +++ b/doc/html/Tutor/Graphics/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -355,16 +350,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in index a5c01e5..33fe961 100644 --- a/doc/html/Tutor/Makefile.in +++ b/doc/html/Tutor/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -478,16 +473,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index 20adbd3..4abb0d8 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -390,16 +385,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in index 7019895..d1fc082 100644 --- a/doc/html/cpplus/Makefile.in +++ b/doc/html/cpplus/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -347,16 +342,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in index 38112b8..9706f61 100644 --- a/doc/html/ed_libs/Makefile.in +++ b/doc/html/ed_libs/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -351,16 +346,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in index d77c889..4d98970 100644 --- a/doc/html/ed_styles/Makefile.in +++ b/doc/html/ed_styles/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -350,16 +345,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in index 6593306..91048db 100644 --- a/doc/html/fortran/Makefile.in +++ b/doc/html/fortran/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -347,16 +342,16 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/examples/Makefile.am b/examples/Makefile.am index be9d5ae..222799c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -67,9 +67,9 @@ $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ install-data-local: - $(MAKE) install-examples + $(MAKE) $(AM_MAKEFLAGS) install-examples uninstall-local: - $(MAKE) uninstall-examples + $(MAKE) $(AM_MAKEFLAGS) uninstall-examples # We want to install the source files, not the examples themselves. Add '.c' to # each example to get its source. This is a bit kludgy. @@ -86,9 +86,9 @@ uninstall-examples: fi check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - $(MAKE) check + $(MAKE) $(AM_MAKEFLAGS) check # List dependencies for each program. Normally, automake would take # care of this for us, but if we tell automake about the programs it diff --git a/examples/Makefile.in b/examples/Makefile.in index 220c0da..ebe662a 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Examples Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -388,9 +377,9 @@ $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ install-data-local: - $(MAKE) install-examples + $(MAKE) $(AM_MAKEFLAGS) install-examples uninstall-local: - $(MAKE) uninstall-examples + $(MAKE) $(AM_MAKEFLAGS) uninstall-examples # We want to install the source files, not the examples themselves. Add '.c' to # each example to get its source. This is a bit kludgy. @@ -407,9 +396,9 @@ uninstall-examples: fi check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - $(MAKE) check + $(MAKE) $(AM_MAKEFLAGS) check # List dependencies for each program. Normally, automake would take # care of this for us, but if we tell automake about the programs it @@ -438,10 +427,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -548,7 +537,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/fortran/Makefile.am b/fortran/Makefile.am index 0d55334..06bd888 100644 --- a/fortran/Makefile.am +++ b/fortran/Makefile.am @@ -34,24 +34,24 @@ DIST_SUBDIRS=src test testpar examples # Clean and mostlyclean need to recurse into examples directory clean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) clean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ fi; mostlyclean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) mostlyclean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; # Install examples install-examples uninstall-examples: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Check that examples can be successfully built check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; include $(top_srcdir)/config/conclude.am diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 688ffab..a4c6512 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -33,18 +33,6 @@ # # Top-level HDF5-Fortran Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -104,6 +92,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -477,24 +466,24 @@ uninstall-info: uninstall-info-recursive # Clean and mostlyclean need to recurse into examples directory clean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) clean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \ fi; mostlyclean-local: - if test -f examples/Makefile; then \ - (cd examples && $(MAKE) mostlyclean) || exit 1; \ + if test -f examples/Makefile; then \ + (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \ fi; # Install examples install-examples uninstall-examples: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # Check that examples can be successfully built check-install: - $(MAKE) installcheck + $(MAKE) $(AM_MAKEFLAGS) installcheck installcheck-local: - (cd examples && $(MAKE) $@) || exit 1; + (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. @@ -503,10 +492,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -613,7 +602,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 62ad52c..4ed6e72 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -29,18 +29,6 @@ # # HDF5-Fortran Examples Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -433,10 +422,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -543,7 +532,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 05b5287..eae340e 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Fortran Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -641,10 +630,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -751,7 +740,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index dba8e7e..21bfb32 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -29,18 +29,6 @@ # # HDF5-Fortran test/Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -754,10 +743,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -864,7 +853,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index c520330..a6ce70f 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Fortran Parallel Library Test Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -485,10 +474,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -595,7 +584,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/Makefile.in b/hl/Makefile.in index b616f06..8289ee6 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -24,18 +24,6 @@ # each subdirectory manually. # # HDF5 High-Level Makefile(.in) - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -95,6 +83,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -470,10 +459,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -580,7 +569,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 1eb3761..da719b0 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -24,18 +24,6 @@ # each subdirectory manually. # # HDF5 High-Level Makefile(.in) - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -95,6 +83,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -468,10 +457,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -578,7 +567,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 3e55144..5cf0c26 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -20,18 +20,6 @@ # # # HDF5 High-Level Fortran Makefile(.in) - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -91,6 +79,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -533,10 +522,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -643,7 +632,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 9038921..d807cb4 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -20,18 +20,6 @@ # # # HDF5 High-Level Fortran Makefile(.in) - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -91,6 +79,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -466,10 +455,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -576,7 +565,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 62059a8..bed13c8 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -19,18 +19,6 @@ # # HDF5 High-Level Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -90,6 +78,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -502,10 +491,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -612,7 +601,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 97101e0..75bf017 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -21,18 +21,6 @@ # # HDF5 High-Level Test Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -92,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -495,10 +484,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -605,7 +594,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 884b7ba..f24e02c 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -511,10 +500,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -621,7 +610,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/perform/Makefile.in b/perform/Makefile.in index ae13d7d..aecc74e 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Performance Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -548,10 +537,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -658,7 +647,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/Makefile.in b/src/Makefile.in index af2efc9..cff9fa0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -847,10 +836,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -957,7 +946,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/test/Makefile.in b/test/Makefile.in index 243ed00..8388da4 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Test Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -1014,10 +1003,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -1124,7 +1113,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/testpar/Makefile.in b/testpar/Makefile.in index e7ab3e9..250c7c0 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -29,18 +29,6 @@ # # hdf5 Parallel Library Test Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -514,10 +503,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -624,7 +613,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/Makefile.am b/tools/Makefile.am index bbd0dbd..4a80c3a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,26 +23,4 @@ include $(top_srcdir)/config/commence.am # All subdirectories SUBDIRS=lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam - -##lib: -## (cd lib && $(MAKE) $@) || exit 1; - -##progs tests: $(LIBTOOLS) $(LIBHDF5) -## @@SETX@; for d in X $(SUBDIRS); do \ -## if test $$d != X; then \ -## (cd $$d && $(MAKE) $@) || exit 1; \ -## fi; \ -## done - -##tests: $(LIBTOOLS) $(LIBHDF5) -## @@SETX@; for d in X $(SUBDIRS); do \ -## if test $$d != X; then \ -## (cd $$d && $(MAKE) $@) || exit 1; \ -## fi; \ -## done - -# Makefile needs to recognize these targets -#test _test: check -#check-install: - include $(top_srcdir)/config/conclude.am diff --git a/tools/Makefile.in b/tools/Makefile.in index cab7823..c94ffc5 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -29,18 +29,6 @@ # # Tools HDF5 Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -474,10 +463,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -584,13 +573,9 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done - -# Makefile needs to recognize these targets -#test _test: check -#check-install: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 884b7ba..f24e02c 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -511,10 +500,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -621,7 +610,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 2252bbb..f18684e 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -571,10 +560,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -681,7 +670,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index dea8a1a..c9a33f2 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -524,10 +513,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -634,7 +623,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index cebd50d..92d147f 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -515,10 +504,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -625,7 +614,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 7cb049f..725a8db 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -13,18 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -84,6 +72,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -549,10 +538,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -659,7 +648,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 4b3ba28..ae88008 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -492,10 +481,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -602,7 +591,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 5da78ff..dda43ed 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -592,10 +581,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -702,7 +691,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index b8d03e4..cf382c1 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -521,10 +510,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -631,7 +620,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 3362269..0055272 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -29,18 +29,6 @@ # # HDF5 Library Makefile(.in) # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -100,6 +88,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -566,10 +555,10 @@ build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(TESTS) lib progs tests :: - @$(MAKE) build-$@ || exit 1; \ + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; \ for d in X $(SUBDIRS); do \ if test $$d != X -a $$d != .; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done @@ -676,7 +665,7 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. |