diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-06-30 15:19:44 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-06-30 15:19:44 (GMT) |
| commit | 007affb6dfc894e2e81a90ae7790473ff6dc26b0 (patch) | |
| tree | 78f04d074ac17cfc4e3777586aa33ddfe804c140 /tools | |
| parent | e51dc29e89aaea2a35d8ab4ab431013ddd0306d1 (diff) | |
| download | hdf5-007affb6dfc894e2e81a90ae7790473ff6dc26b0.zip hdf5-007affb6dfc894e2e81a90ae7790473ff6dc26b0.tar.gz hdf5-007affb6dfc894e2e81a90ae7790473ff6dc26b0.tar.bz2 | |
[svn-r7121]
Purpose:
Bug Fix
Description:
Changes needed to make "pmake" work on Modi4.
Solution:
Needed to add some null macro defines in the commence.in files.
Needed to remove a dependence on LIBH5TEST in the fortran make
since LIBH5TEST isn't used in the fortran stuff.
Platforms tested:
Modi4 (small change)
Misc. update:
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 68 |
1 files changed, 47 insertions, 21 deletions
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 |