summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-02-11 17:40:52 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-02-11 17:40:52 (GMT)
commit3f0a35a4eab869793f5b3882da35a2fe0b683dbd (patch)
tree35c5a256e137aa8e16c120b4a59feab2cbeb2fe0 /src
parent54f376edbb1bce24bff19fb6b7c3d298470356be (diff)
downloadhdf5-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 'src')
-rw-r--r--src/Makefile.in19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index af2efc9..cff9fa0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -29,18 +29,6 @@
#
# HDF5 Library 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@
@@ -847,10 +836,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
@@ -957,7 +946,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.