[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

2 files changed, 12 insertions, 23 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index be9d5ae..222799c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -67,9 +67,9 @@ $(EXAMPLEDIR):
 	-$(top_srcdir)/bin/mkdirs $@
 
 install-data-local:
-	$(MAKE) install-examples
+	$(MAKE) $(AM_MAKEFLAGS) install-examples
 uninstall-local:
-	$(MAKE) uninstall-examples
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 # We want to install the source files, not the examples themselves.  Add '.c' to
 # each example to get its source.  This is a bit kludgy.
@@ -86,9 +86,9 @@ uninstall-examples:
 	fi
 
 check-install:
-	$(MAKE) installcheck
+	$(MAKE) $(AM_MAKEFLAGS) installcheck
 installcheck-local:
-	$(MAKE) check
+	$(MAKE) $(AM_MAKEFLAGS) check
 
 # List dependencies for each program.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 220c0da..ebe662a 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -29,18 +29,6 @@
 #
 # HDF5 Library Examples Makefile(.in)
 #
-
-#------------------------------------------------------------ -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/commence' file which was generated with config.status
-# from `./config/commence.in'.
-#-----------------------------------------------------------------------------
-
-#------------------------------------------------------------ -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/conclude' file which was generated with config.status
-# from `./config/conclude.in'.
-#-----------------------------------------------------------------------------
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -100,6 +88,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@
@@ -388,9 +377,9 @@ $(EXAMPLEDIR):
 	-$(top_srcdir)/bin/mkdirs $@
 
 install-data-local:
-	$(MAKE) install-examples
+	$(MAKE) $(AM_MAKEFLAGS) install-examples
 uninstall-local:
-	$(MAKE) uninstall-examples
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
 # We want to install the source files, not the examples themselves.  Add '.c' to
 # each example to get its source.  This is a bit kludgy.
@@ -407,9 +396,9 @@ uninstall-examples:
 	fi
 
 check-install:
-	$(MAKE) installcheck
+	$(MAKE) $(AM_MAKEFLAGS) installcheck
 installcheck-local:
-	$(MAKE) check
+	$(MAKE) $(AM_MAKEFLAGS) check
 
 # List dependencies for each program.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
@@ -438,10 +427,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
 
@@ -548,7 +537,7 @@ check-vfd:
 	        echo "============================";                          \
 	        echo "Testing Virtual File Driver $$vfd";                     \
 	        echo "============================";                          \
-	        HDF5_DRIVER=$$vfd $(MAKE) check;                              \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
 	    fi;                                                               \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.