[rtems commit] build-system: Fix the targets support for the parallel build.

Chris Johns chrisj at rtems.org
Fri May 26 00:35:36 UTC 2017


Module:    rtems
Branch:    master
Commit:    7ec982bfeb4edee3f108be98288c3a4aa00b4f3e
Changeset: http://git.rtems.org/rtems/commit/?id=7ec982bfeb4edee3f108be98288c3a4aa00b4f3e

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri May 26 10:35:17 2017 +1000

build-system: Fix the targets support for the parallel build.

---

 c/src/automake/subdirs.am      | 2 +-
 cpukit/automake/subdirs.am     | 2 +-
 testsuites/Makefile.am         | 2 +-
 testsuites/automake/subdirs.am | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/c/src/automake/subdirs.am b/c/src/automake/subdirs.am
index 3e57f0c..2f39d85 100644
--- a/c/src/automake/subdirs.am
+++ b/c/src/automake/subdirs.am
@@ -56,7 +56,7 @@ $1: $(preintstall_targets)
 	echo "Making $$$$target in $$$$subdir"; \
 	if test "$$$$subdir" != "."; then \
 	  cd $$$$subdir; \
-	  $(MAKE) $(AM_MAKEFLAGS) $$$$local_target; \
+	  $(MAKE) $(AM_MAKEFLAGS) $$$$target; \
 	fi;
 endef
 
diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am
index 723aec8..8677044 100644
--- a/cpukit/automake/subdirs.am
+++ b/cpukit/automake/subdirs.am
@@ -53,7 +53,7 @@ $1: $(preintstall_targets)
 	echo "Making $$$$target in $$$$subdir"; \
 	if test "$$$$subdir" != "."; then \
 	  cd $$$$subdir; \
-	  $(MAKE) $(AM_MAKEFLAGS) $$$$local_target; \
+	  $(MAKE) $(AM_MAKEFLAGS) $$$$target; \
 	fi;
 endef
 
diff --git a/testsuites/Makefile.am b/testsuites/Makefile.am
index 92f8ad8..a466996 100644
--- a/testsuites/Makefile.am
+++ b/testsuites/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS += support/include/pritime.h
 noinst_HEADERS += support/include/primode.h
 noinst_HEADERS += support/include/tmtests_empty_function.h
 
-SUBDIRS = @subdirs@
+_SUBDIRS = @subdirs@
 
 EXTRA_DIST = PROBLEMS
 
diff --git a/testsuites/automake/subdirs.am b/testsuites/automake/subdirs.am
index f4152e5..4bedcb7 100644
--- a/testsuites/automake/subdirs.am
+++ b/testsuites/automake/subdirs.am
@@ -28,7 +28,6 @@ $1:
 	    if test -f $$$$tcheck; then \
 	      test_FLAGS=`$$$$tcheck flags $(RTEMS_BSP) $$$$tdata $$$$tincludes $(1)`; \
 	    fi; \
-	    local_target="$$$$target"; \
 	    if test -z "$$$$test_FLAGS"; then \
 	      echo "BSP Testsuite: $(1): PASS"; \
 	    else \
@@ -36,7 +35,7 @@ $1:
 	    fi; \
 	    echo "Making $$$$target in $(1)"; \
 	    cd $(1); \
-	    $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$$$test_FLAGS" $$$$local_target; \
+	    $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$$$test_FLAGS" $$$$target; \
 	  else \
 	    echo "BSP Testsuite: $(1): EXCLUDED"; \
 	  fi; \




More information about the vc mailing list