[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

3 files changed, 12 insertions, 45 deletions

diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 1eb3761..da719b0 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -24,18 +24,6 @@
 # each subdirectory manually.
 #
 # HDF5 High-Level 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@
@@ -95,6 +83,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@
@@ -468,10 +457,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
 
@@ -578,7 +567,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.
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 3e55144..5cf0c26 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -20,18 +20,6 @@
 #
 #
 # HDF5 High-Level Fortran 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@
@@ -91,6 +79,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@
@@ -533,10 +522,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
 
@@ -643,7 +632,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.
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 9038921..d807cb4 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -20,18 +20,6 @@
 #
 #
 # HDF5 High-Level Fortran 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@
@@ -91,6 +79,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@
@@ -466,10 +455,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
 
@@ -576,7 +565,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.