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 /doc/html/Tutor | |
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 'doc/html/Tutor')
-rw-r--r-- | doc/html/Tutor/Graphics/Makefile.in | 15 | ||||
-rw-r--r-- | doc/html/Tutor/Makefile.in | 15 | ||||
-rw-r--r-- | doc/html/Tutor/examples/Makefile.in | 15 |
3 files changed, 15 insertions, 30 deletions
diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in index 0f46cc0..750ba64 100644 --- a/doc/html/Tutor/Graphics/Makefile.in +++ b/doc/html/Tutor/Graphics/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -355,16 +350,16 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in index a5c01e5..33fe961 100644 --- a/doc/html/Tutor/Makefile.in +++ b/doc/html/Tutor/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -478,16 +473,16 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index 20adbd3..4abb0d8 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -21,12 +21,6 @@ # All rights reserved. # # - -#------------------------------------------------------------ -*- makefile -*- -# The following section of this makefile comes from the -# `./config/commence' file which was generated with config.status -# from `./config/commence.in'. -#----------------------------------------------------------------------------- SHELL = @SHELL@ srcdir = @srcdir@ @@ -86,6 +80,7 @@ AUTOMAKE = /usr/bin/automake AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMTAR = @AMTAR@ +AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ AS = @AS@ AWK = @AWK@ @@ -390,16 +385,16 @@ 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |