diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-02-11 17:40:52 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-02-11 17:40:52 (GMT) |
| commit | 3f0a35a4eab869793f5b3882da35a2fe0b683dbd (patch) | |
| tree | 35c5a256e137aa8e16c120b4a59feab2cbeb2fe0 /config | |
| parent | 54f376edbb1bce24bff19fb6b7c3d298470356be (diff) | |
| download | hdf5-3f0a35a4eab869793f5b3882da35a2fe0b683dbd.zip hdf5-3f0a35a4eab869793f5b3882da35a2fe0b683dbd.tar.gz hdf5-3f0a35a4eab869793f5b3882da35a2fe0b683dbd.tar.bz2 | |
[svn-r9988] Purpose:
Bug fix
Description:
pmake (on modi4, for instance) complains about undefined variables
if it is run without the -V flag, which turns those errors to warnings.
Solution:
Added test to configure.in to see if $MAKE will allow Makefiles
with undefined variables. If not, sets -V flag in AM_MAKEFLAGS.
Ensured that all custom make targets use AM_MAKEFLAGS.
Also defined all variables that caused errors in top-level Makefile.am.
This means that pmake can be used to build hdf5 *from the top level
only*. To run make from a subdirectory, still need to use -V flag
(or use make or gmake).
Platforms tested:
modi4, heping, copper, sleipnir
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence-doc.am | 9 | ||||
| -rw-r--r-- | config/commence.am | 8 | ||||
| -rw-r--r-- | config/conclude.am | 14 |
3 files changed, 14 insertions, 17 deletions
diff --git a/config/commence-doc.am b/config/commence-doc.am index 48136af..2d746a1 100644 --- a/config/commence-doc.am +++ b/config/commence-doc.am @@ -1,3 +1,4 @@ +## config/commence-doc.am ## This file supplies Makefile.am files in the doc directory (and subdirectories) ## with the rules they need. @@ -9,13 +10,13 @@ lib progs check test _test: tests dep depend: @@SETX@; for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ + if test $$d != X; then \ + (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; done # In docs directory, install-doc is the same as install install-doc install-all: - $(MAKE) install + $(MAKE) $(AM_MAKEFLAGS) install uninstall-doc uninstall-all: - $(MAKE) uninstall + $(MAKE) $(AM_MAKEFLAGS) uninstall diff --git a/config/commence.am b/config/commence.am index 5c8339c..2125b92 100644 --- a/config/commence.am +++ b/config/commence.am @@ -1,8 +1,6 @@ -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- +## config/commence.am +## Textually included in the beginning of every HDF5 Makefile.am +## Contains definitions, etc. used across multiple Makefiles. # Shell commands used in Makefiles RM=rm -f diff --git a/config/conclude.am b/config/conclude.am index f712294..19b61f5 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -1,8 +1,6 @@ -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/conclude' file which was generated with config.status -# from `./config/conclude.in'. -#----------------------------------------------------------------------------- +## config/conclude.am +## Textually included at the end of most HDF5 Makefiles.am. +## Contains build rules. # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., @@ -23,10 +21,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 @@ -133,6 +131,6 @@ check-vfd: echo "============================"; \ echo "Testing Virtual File Driver $$vfd"; \ echo "============================"; \ - HDF5_DRIVER=$$vfd $(MAKE) check; \ + HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \ fi; \ done |