diff options
| -rw-r--r-- | c++/config/commence.in | 4 | ||||
| -rw-r--r-- | config/commence.in | 4 | ||||
| -rw-r--r-- | fortran/config/commence.in | 4 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 68 |
5 files changed, 60 insertions, 22 deletions
diff --git a/c++/config/commence.in b/c++/config/commence.in index 8f63096..381f014 100644 --- a/c++/config/commence.in +++ b/c++/config/commence.in @@ -72,6 +72,10 @@ PROGS= TEST_PROGS= TEST_FLAGS= TEST_SCRIPTS= +AUX_LIB= +EXAMPLE_PROGS= +SUBDIRS= +LIBHDF5= ## The default is to build the library and/or programs. We must build ## them sequentially. diff --git a/config/commence.in b/config/commence.in index 0cdfce1..af1275c 100644 --- a/config/commence.in +++ b/config/commence.in @@ -72,6 +72,10 @@ TEST_PROGS= TEST_PROGS_PARA= TEST_FLAGS= TEST_SCRIPTS= +AUX_LIB= +EXAMPLE_PROGS= +SUBDIRS= +LIBHDF5= ## The default is to build the library and/or programs. We must build ## them sequentially. diff --git a/fortran/config/commence.in b/fortran/config/commence.in index 6abbfc5..b3d4f6e 100644 --- a/fortran/config/commence.in +++ b/fortran/config/commence.in @@ -79,6 +79,10 @@ PROGS= TEST_PROGS= TEST_FLAGS= TEST_SCRIPTS= +AUX_LIB= +EXAMPLE_PROGS= +SUBDIRS= +LIBHDF5= ## The default is to build the library and/or programs. We must build ## them sequentially. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 2ee682a..2cf5cef 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -47,7 +47,7 @@ TEST_OBJ=$(TEST_SRC:.f90=.lo) TEST_HDR= ## How to build the tests... They all depend on the hdf5 library -$(TEST_PROGS): $(LIBHDF5) $(LIBH5TEST) +$(TEST_PROGS): $(LIBHDF5) $(TEST_OBJ): $(TEST_HDR) diff --git a/tools/Makefile.in b/tools/Makefile.in index fb0147a..ae0ab44 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,9 +1,17 @@ ## Tools HDF5 Makefile(.in) ## -## Copyright (C) 2001, 2002 -## National Center for Supercomputing Applications. -## All rights reserved. +## Copyright by the Board of Trustees of the University of Illinois. +## All rights reserved. ## +## This file is part of HDF5. The full HDF5 copyright notice, including +## terms governing use, modification, and redistribution, is contained in +## the files COPYING and Copyright.html. COPYING can be found at the root +## of the source code distribution tree; Copyright.html can be found at the +## root level of an installed copy of the electronic HDF5 document set and +## is linked from the top-level documents page. It can also be found at +## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have +## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. +## top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ @@ -41,51 +49,69 @@ lib :: (cd lib && $(MAKE) $@) || exit 1; progs: $(LIBTOOLS) $(LIBHDF5) - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + @@SETX@; for d in X $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done dep depend: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done check tests test _test: $(PROGS) - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done uninstall: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done install: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done install-doc: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@); \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@); \ + fi; \ done .PHONY: all lib progs test _test install uninstall clean \ mostlyclean distclean maintainer-clean clean mostlyclean: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@); \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@); \ + fi; \ done distclean: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@); \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@); \ + fi; \ done -$(RM) Makefile maintainer-clean: - @@SETX@; for d in lib $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@); \ + @@SETX@; for d in X lib $(SUBDIRS); do \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $@); \ + fi; \ done |