summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Soumagne <jsoumagne@hdfgroup.org>2015-03-25 18:01:52 (GMT)
committerJerome Soumagne <jsoumagne@hdfgroup.org>2015-03-25 18:01:52 (GMT)
commitb3cf42b88700829d5db57517fb171644c9a15c77 (patch)
tree93f04c42ee885683e059baf99f69ec2d64b049ba
parent72c3c71be9d1643f860e3fec8db18f7957a0cf12 (diff)
downloadhdf5-b3cf42b88700829d5db57517fb171644c9a15c77.zip
hdf5-b3cf42b88700829d5db57517fb171644c9a15c77.tar.gz
hdf5-b3cf42b88700829d5db57517fb171644c9a15c77.tar.bz2
[svn-r26581] Merge r26526 from trunk
Remove SETX variable from Makefile.am/Makefile.in Part of: HDFFV-9164
-rw-r--r--Makefile.am10
-rw-r--r--Makefile.in10
-rw-r--r--hl/Makefile.am2
-rw-r--r--hl/Makefile.in2
4 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 0fbf2ea..50e7928 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,7 @@ CHECK_CLEANFILES+=*-tmp
test _test: check
lib progs check-p check-s:
- @@SETX@; for d in $(SUBDIRS); do \
+ for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -95,7 +95,7 @@ lib progs check-p check-s:
# Make all, tests, and (un)install
tests:
- @@SETX@; for d in $(SUBDIRS); do \
+ for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -103,7 +103,7 @@ tests:
# Check-clean also recurses into examples directory
check-clean:
- @@SETX@; for d in $(SUBDIRS) examples; do \
+ for d in $(SUBDIRS) examples; do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -130,7 +130,7 @@ uninstall-all:
# Install examples in this directory and recursively
install-examples uninstall-examples:
- @@SETX@; for d in examples $(HDF5_INTERFACES) $(HL); do \
+ for d in examples $(HDF5_INTERFACES) $(HL); do \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done
@@ -177,7 +177,7 @@ trace:
# Run tests with different Virtual File Drivers.
# Currently, only invoke check-vfd in the test directory.
check-vfd:
- @@SETX@; for d in src test; do \
+ for d in src test; do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
diff --git a/Makefile.in b/Makefile.in
index 1ab4b47..3f46ed6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1006,7 +1006,7 @@ help:
test _test: check
lib progs check-p check-s:
- @@SETX@; for d in $(SUBDIRS); do \
+ for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -1014,7 +1014,7 @@ lib progs check-p check-s:
# Make all, tests, and (un)install
tests:
- @@SETX@; for d in $(SUBDIRS); do \
+ for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -1022,7 +1022,7 @@ tests:
# Check-clean also recurses into examples directory
check-clean:
- @@SETX@; for d in $(SUBDIRS) examples; do \
+ for d in $(SUBDIRS) examples; do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
@@ -1049,7 +1049,7 @@ uninstall-all:
# Install examples in this directory and recursively
install-examples uninstall-examples:
- @@SETX@; for d in examples $(HDF5_INTERFACES) $(HL); do \
+ for d in examples $(HDF5_INTERFACES) $(HL); do \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done
@@ -1096,7 +1096,7 @@ trace:
# Run tests with different Virtual File Drivers.
# Currently, only invoke check-vfd in the test directory.
check-vfd:
- @@SETX@; for d in src test; do \
+ for d in src test; do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
diff --git a/hl/Makefile.am b/hl/Makefile.am
index 3271575..9f31719 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -43,7 +43,7 @@ DIST_SUBDIRS=src test tools c++ fortran examples
# Install examples
install-examples uninstall-examples:
- @@SETX@; for d in examples $(HDF5_INTERFACES); do \
+ for d in examples $(HDF5_INTERFACES); do \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done
diff --git a/hl/Makefile.in b/hl/Makefile.in
index a4464b7..176f3b0 100644
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -1163,7 +1163,7 @@ help:
# Install examples
install-examples uninstall-examples:
- @@SETX@; for d in examples $(HDF5_INTERFACES); do \
+ for d in examples $(HDF5_INTERFACES); do \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
done