diff options
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/Makefile.am | 14 | ||||
-rw-r--r-- | fortran/Makefile.in | 33 | ||||
-rw-r--r-- | fortran/examples/Makefile.in | 19 | ||||
-rw-r--r-- | fortran/src/Makefile.in | 19 | ||||
-rw-r--r-- | fortran/test/Makefile.in | 19 | ||||
-rw-r--r-- | fortran/testpar/Makefile.in | 19 |
6 files changed, 34 insertions, 89 deletions
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. |