diff options
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/Makefile.am | 13 | ||||
| -rw-r--r-- | c++/Makefile.in | 17 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 4 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 4 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 4 |
5 files changed, 34 insertions, 8 deletions
diff --git a/c++/Makefile.am b/c++/Makefile.am index 986aca4..d886bdb 100644 --- a/c++/Makefile.am +++ b/c++/Makefile.am @@ -29,11 +29,16 @@ DIST_SUBDIRS = src test examples install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + include $(top_srcdir)/config/conclude.am diff --git a/c++/Makefile.in b/c++/Makefile.in index 9e8302b..9888fac 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -660,13 +660,18 @@ check-install: installcheck install-examples uninstall-examples: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; -# Check that examples can be successfully built -check-install: - @$(MAKE) $(AM_MAKEFLAGS) installcheck - installcheck-local: @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; +# Clean examples when check-clean is invoked +check-clean :: + @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; + @for d in X $(SUBDIRS) examples; do \ + if test $$d != X && test $$d != .; then \ + (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ + fi; \ + done + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -693,6 +698,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -712,6 +718,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 742b0d9..68421e5 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -602,6 +602,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -621,6 +622,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 2cd4718..1bb4e67 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -787,6 +787,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -806,6 +807,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 41fa310..cddcfad 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -677,6 +677,7 @@ check-clean :: (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + # Tell Automake to build tests when the user types `make all' (this is # not its default behavior). Also build EXTRA_LIB and EXTRA_PROG since # Automake won't build them automatically, either. @@ -696,6 +697,9 @@ build-check-clean: # run check-clean whenever mostlyclean is run mostlyclean-local: build-check-clean +# check-install is just a synonym for installcheck + @$(MAKE) $(AM_MAKEFLAGS) installcheck + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. |