diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-05-26 10:35:17 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-05-26 10:35:17 +1000 |
| commit | 7ec982bfeb4edee3f108be98288c3a4aa00b4f3e (patch) | |
| tree | 0c7e658a5d90f5eb9c8396ffec46d87386cf7b49 | |
| parent | testsuite: Fix excluding tests that a substring of another test. (diff) | |
| download | rtems-7ec982bfeb4edee3f108be98288c3a4aa00b4f3e.tar.bz2 | |
build-system: Fix the targets support for the parallel build.
| -rw-r--r-- | c/src/automake/subdirs.am | 2 | ||||
| -rw-r--r-- | cpukit/automake/subdirs.am | 2 | ||||
| -rw-r--r-- | testsuites/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 3e57f0c06f..2f39d858ce 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 723aec8af2..867704460f 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 92f8ad86a6..a466996fa4 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 f4152e56f2..4bedcb74f0 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; \ |