From a10961f0cdc7958d837f66d589e3304619d8bcf2 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 22 Apr 2003 17:52:25 -0500 Subject: [svn-r6732] Purpose: Bug fix and feature Description: The patch to Makefile.in failed if an empty directory of fortran/examples was left behind by a previous build. Solution: Attempted to put it in config/conclude.in just became a mess since it is hard to predict when we will include examples in the subdirs or not. Borrow the structure of install-examples and do some handcode per interface. The Makefile.in of each interface (C, Fortran, C++) controls everything. Not very systematic but pretty clean for this case. Platforms tested: h5committested. Also tested in modi4 with various combinations of fortran, c++ enabled. Misc. update: --- Makefile.in | 13 ++++++++----- c++/Makefile.in | 5 +++++ fortran/Makefile.in | 5 +++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index cd0cec5..6f2ad48 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,12 +119,15 @@ uninstall-doc: @$(MAKE) uninstall-examples (cd doc && $(MAKE) $@) || exit 1; -## need to require a proper "make install" has been done. +## Check if installation is correct by checking if examples can be built. +## This requires a proper "make install" has been done. check-install: - (cd examples && $(MAKE) check) || exit 1; - if test -d fortran/examples; then \ - (cd fortran/examples && $(MAKE) check) || exit 1; \ - fi + (cd examples && $(MAKE) check) || exit 1 + @@SETX@; for d in dummy @subdirs@; do \ + if test $$d != "dummy"; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ + done ## Number format detection H5detect: diff --git a/c++/Makefile.in b/c++/Makefile.in index 42e400e..ca0f576 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -104,6 +104,11 @@ install-examples: uninstall-examples: (cd examples && $(MAKE) $@) || exit 1; +## Check if installation is correct by checking if examples can be built. +## This requires a proper "make install" has been done. +check-install: + (cd examples && $(MAKE) check) || exit 1 + .PHONY: all lib progs test _test install uninstall dep depend clean \ mostlyclean distclean maintainer-clean diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 3fccad8..63a4177 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -99,6 +99,11 @@ install-examples: uninstall-examples: (cd examples && $(MAKE) $@) || exit 1; +## Check if installation is correct by checking if examples can be built. +## This requires a proper "make install" has been done. +check-install: + (cd examples && $(MAKE) check) || exit 1 + .PHONY: all lib progs test _test install uninstall dep depend clean \ mostlyclean distclean maintainer-clean -- cgit v0.12