summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.am14
-rw-r--r--c++/Makefile.in33
-rw-r--r--c++/examples/Makefile.in19
-rw-r--r--c++/src/Makefile.in19
-rw-r--r--c++/test/Makefile.in19
5 files changed, 30 insertions, 74 deletions
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.
generated by cgit v0.12 at 2024-10-30 14:20:41 (GMT)