From b8a30d07a5a149eab8217c57c2fdf387efdf27f1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 13 Jul 2000 15:05:38 +0000 Subject: Patch rtems-rc-20000713-1-cvs.diff from Ralf Corsepius that is yet another multilib-related structual cleanup patch: Changes: * Make RTEMS_TEST_NO_PAUSE a tests/ subpackage specific option. - Remove RTEMS_TEST_NO_PAUSE from custom/*.cfg, targopts.h and cpuopts.h. - Add autoconf macros RTEMS_*_RTEMS_TEST_NO_PAUSE (aclocal/rtems-test-no-pause.m4). - Add RTEMS_*_RTEMS_TEST_NO_PAUSE support to sptests/configure.ins and tmtests/configure.in. These are the only subdirectories which currently apply RTEMS_TEST_NO_PAUSE. - Add autoconf-DEFS support to all test subpackages' configure.ins below tests/. I.e. AC_DEFINES now get explicitly propagated as preprocessor defines into Makefiles, cf. AM_CPPFLAGS in tests/*/*.am, instead of using a global config-files. - Remove NDEBUG from custom/*.cfg. * AC_DEFINE POSIX_API, ITRON_API and MULTIPROCESSING in exec/configure.in, only. - All other sources now should relay on the values from cpuopts.h and should not define them themselves. - Several related changes to many configure.ins * Bug-fixes to RTEMS_*_RTEMS_DEBUG macros (Actually workarounds to quoting bugs in autoconf). Notes: * This patch is rather immature and only tested for a small subset of BSPs (requires the tests to be enabled and therefore takes an tremendous amount of disc space and time.) * The patches to *cfg were generated by a script. Expect file formating changes :) --- Makefile.am | 3 ++- aclocal/check-itron.m4 | 3 +++ aclocal/check-multiprocessing.m4 | 4 +++- aclocal/check-posix.m4 | 3 +++ aclocal/rtems-debug.m4 | 4 +++- aclocal/rtems-test-no-pause.m4 | 18 ++++++++++++++++++ c/src/exec/configure.in | 4 ++++ c/src/exec/itron/configure.in | 2 -- c/src/exec/posix/configure.in | 1 - c/src/exec/score/cpu/unix/configure.in | 2 -- c/src/lib/configure.in | 1 - c/src/lib/libbsp/a29k/portsw/configure.in | 1 - c/src/lib/libbsp/configure.in | 1 - c/src/lib/libbsp/h8300/h8sim/configure.in | 1 - c/src/lib/libbsp/hppa1.1/simhppa/configure.in | 1 - c/src/lib/libbsp/i960/cvme961/configure.in | 1 - c/src/lib/libbsp/i960/i960sim/configure.in | 1 - c/src/lib/libbsp/i960/rxgen960/configure.in | 1 - c/src/lib/libbsp/no_cpu/no_bsp/configure.in | 1 - c/src/lib/libbsp/powerpc/dmv177/configure.in | 3 --- c/src/lib/libbsp/powerpc/eth_comm/configure.in | 3 --- c/src/lib/libbsp/powerpc/helas403/configure.in | 3 --- c/src/lib/libbsp/powerpc/mbx8xx/configure.in | 3 --- c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in | 3 --- c/src/lib/libbsp/powerpc/papyrus/configure.in | 3 --- c/src/lib/libbsp/powerpc/ppcn_60x/configure.in | 1 - c/src/lib/libbsp/powerpc/psim/configure.in | 1 - c/src/lib/libbsp/unix/posix/configure.in | 1 - c/src/libmisc/configure.in | 1 - c/src/tests/configure.in | 2 -- c/src/tests/itrontests/configure.in | 1 - c/src/tests/itrontests/itrontests.am | 2 ++ c/src/tests/libtests/configure.in | 2 +- c/src/tests/libtests/libtests.am | 2 ++ c/src/tests/mptests/configure.in | 2 -- c/src/tests/mptests/mp01/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp01/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp02/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp02/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp03/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp03/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp04/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp04/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp05/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp05/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp06/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp06/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp07/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp07/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp08/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp08/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp09/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp09/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp10/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp10/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp11/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp11/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp12/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp12/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp13/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp13/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mp14/node1/Makefile.am | 4 ++-- c/src/tests/mptests/mp14/node2/Makefile.am | 4 ++-- c/src/tests/mptests/mptests.am | 2 ++ c/src/tests/psxtests/configure.in | 1 - c/src/tests/psxtests/psxtests.am | 2 ++ c/src/tests/samples/base_mp/node1/Makefile.am | 4 ++-- c/src/tests/samples/base_mp/node2/Makefile.am | 4 ++-- c/src/tests/samples/configure.in | 5 ----- c/src/tests/samples/sample.am | 2 ++ c/src/tests/sptests/configure.in | 2 +- c/src/tests/sptests/sptests.am | 2 ++ c/src/tests/support/configure.in | 2 -- c/src/tests/tmitrontests/configure.in | 1 - c/src/tests/tmitrontests/tmitrontests.am | 2 ++ c/src/tests/tmtests/configure.in | 2 +- c/src/tests/tmtests/tmtests.am | 2 ++ make/custom/Cygwin-posix.cfg | 5 ----- make/custom/FreeBSD-posix.cfg | 8 -------- make/custom/HPUX9-posix.cfg | 4 ---- make/custom/Linux-posix.cfg | 5 ----- make/custom/Solaris-posix.cfg | 5 ----- make/custom/bare.cfg | 5 ----- make/custom/cvme961.cfg | 5 ----- make/custom/dmv152.cfg | 5 ----- make/custom/dmv177.cfg | 4 ---- make/custom/efi332.cfg | 6 ------ make/custom/efi68k.cfg | 5 ----- make/custom/erc32.cfg | 6 ------ make/custom/eth_comm.cfg | 5 ----- make/custom/gen68302.cfg | 5 ----- make/custom/gen68340.cfg | 5 ----- make/custom/gen68360.cfg | 7 ------- make/custom/gensh1.cfg | 6 ------ make/custom/gensh2.cfg | 5 ----- make/custom/h8sim.cfg | 5 ----- make/custom/helas403.cfg | 5 ----- make/custom/i386ex.cfg | 5 ----- make/custom/i960sim.cfg | 5 ----- make/custom/idp.cfg | 5 ----- make/custom/mbx860_005b.cfg | 1 - make/custom/mbx8xx.cfg | 6 ------ make/custom/mcp750.cfg | 5 ----- make/custom/mvme136.cfg | 7 ------- make/custom/mvme147.cfg | 6 ------ make/custom/mvme162.cfg | 4 ---- make/custom/mvme167.cfg | 4 ---- make/custom/mvme2307.cfg | 5 ----- make/custom/ods68302.cfg | 5 ----- make/custom/p4000.cfg | 6 ------ make/custom/p4600.cfg | 6 ------ make/custom/p4650.cfg | 6 ------ make/custom/papyrus.cfg | 5 ----- make/custom/pc386.cfg | 5 ----- make/custom/portsw.cfg | 6 ------ make/custom/ppcn_60x.cfg | 4 ---- make/custom/psim.cfg | 6 ------ make/custom/rxgen960.cfg | 4 ---- make/custom/score603e.cfg | 5 ----- make/custom/simhppa.cfg | 5 ----- make/custom/ts_386ex.cfg | 4 ---- testsuites/itrontests/itrontests.am | 2 ++ testsuites/libtests/libtests.am | 2 ++ testsuites/mptests/mp01/node1/Makefile.am | 4 ++-- testsuites/mptests/mp01/node2/Makefile.am | 4 ++-- testsuites/mptests/mp02/node1/Makefile.am | 4 ++-- testsuites/mptests/mp02/node2/Makefile.am | 4 ++-- testsuites/mptests/mp03/node1/Makefile.am | 4 ++-- testsuites/mptests/mp03/node2/Makefile.am | 4 ++-- testsuites/mptests/mp04/node1/Makefile.am | 4 ++-- testsuites/mptests/mp04/node2/Makefile.am | 4 ++-- testsuites/mptests/mp05/node1/Makefile.am | 4 ++-- testsuites/mptests/mp05/node2/Makefile.am | 4 ++-- testsuites/mptests/mp06/node1/Makefile.am | 4 ++-- testsuites/mptests/mp06/node2/Makefile.am | 4 ++-- testsuites/mptests/mp07/node1/Makefile.am | 4 ++-- testsuites/mptests/mp07/node2/Makefile.am | 4 ++-- testsuites/mptests/mp08/node1/Makefile.am | 4 ++-- testsuites/mptests/mp08/node2/Makefile.am | 4 ++-- testsuites/mptests/mp09/node1/Makefile.am | 4 ++-- testsuites/mptests/mp09/node2/Makefile.am | 4 ++-- testsuites/mptests/mp10/node1/Makefile.am | 4 ++-- testsuites/mptests/mp10/node2/Makefile.am | 4 ++-- testsuites/mptests/mp11/node1/Makefile.am | 4 ++-- testsuites/mptests/mp11/node2/Makefile.am | 4 ++-- testsuites/mptests/mp12/node1/Makefile.am | 4 ++-- testsuites/mptests/mp12/node2/Makefile.am | 4 ++-- testsuites/mptests/mp13/node1/Makefile.am | 4 ++-- testsuites/mptests/mp13/node2/Makefile.am | 4 ++-- testsuites/mptests/mp14/node1/Makefile.am | 4 ++-- testsuites/mptests/mp14/node2/Makefile.am | 4 ++-- testsuites/mptests/mptests.am | 2 ++ testsuites/psxtests/psxtests.am | 2 ++ testsuites/samples/base_mp/node1/Makefile.am | 4 ++-- testsuites/samples/base_mp/node2/Makefile.am | 4 ++-- testsuites/samples/sample.am | 2 ++ testsuites/sptests/sptests.am | 2 ++ testsuites/tmitrontests/tmitrontests.am | 2 ++ testsuites/tmtests/tmtests.am | 2 ++ 159 files changed, 191 insertions(+), 402 deletions(-) create mode 100644 aclocal/rtems-test-no-pause.m4 diff --git a/Makefile.am b/Makefile.am index 9d03bf5f6d..586e5fa90f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,8 @@ ACLOCAL_FILES += aclocal/ar-s.m4 aclocal/bsp-alias.m4 \ aclocal/i386-gas-code16.m4 aclocal/path-ksh.m4 aclocal/path-perl.m4 \ aclocal/prog-cc.m4 aclocal/prog-cxx.m4 aclocal/project-root.m4 \ aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 aclocal/target.m4 \ - aclocal/tool-paths.m4 aclocal/tool-prefix.m4 aclocal/multilib.m4 + aclocal/tool-paths.m4 aclocal/tool-prefix.m4 aclocal/multilib.m4 \ + aclocal/rtems-debug.m4 aclocal/rtems-test-no-pause.m4 noinst_SCRIPTS = bootstrap diff --git a/aclocal/check-itron.m4 b/aclocal/check-itron.m4 index a5813878d7..4c4dbf0042 100644 --- a/aclocal/check-itron.m4 +++ b/aclocal/check-itron.m4 @@ -26,7 +26,10 @@ else HAS_ITRON_API="no"; fi AC_SUBST(HAS_ITRON_API)dnl +]) +AC_DEFUN(RTEMS_DEFINE_ITRON_API, +[AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl if test x"${HAS_ITRON_API}" = x"yes"; then AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported]) diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4 index e5ddc8fbe0..6e99a38afa 100644 --- a/aclocal/check-multiprocessing.m4 +++ b/aclocal/check-multiprocessing.m4 @@ -35,10 +35,12 @@ else HAS_MP="no" fi AC_SUBST(HAS_MP) +]) +AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING, +[AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl if test x"${HAS_MP}" = x"yes"; then AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported]) fi - ]) diff --git a/aclocal/check-posix.m4 b/aclocal/check-posix.m4 index 16e2bf350e..b98f382165 100644 --- a/aclocal/check-posix.m4 +++ b/aclocal/check-posix.m4 @@ -26,7 +26,10 @@ else HAS_POSIX_API="no"; fi AC_SUBST(HAS_POSIX_API)dnl +]) +AC_DEFUN(RTEMS_DEFINE_POSIX_API, +[AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl if test x"${HAS_POSIX_API}" = x"yes"; then AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported]) diff --git a/aclocal/rtems-debug.m4 b/aclocal/rtems-debug.m4 index 2f4941c3e1..d895b921b0 100644 --- a/aclocal/rtems-debug.m4 +++ b/aclocal/rtems-debug.m4 @@ -1,3 +1,5 @@ +## $Id$ + AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG, [ AC_ARG_ENABLE(rtems-debug, @@ -10,7 +12,7 @@ esac],[RTEMS_DEBUG=no]) ]) AC_DEFUN(RTEMS_CHECK_RTEMS_DEBUG, -[AC_REQUIRE(RTEMS_ENABLE_RTEMS_DEBUG) +[AC_REQUIRE([RTEMS_ENABLE_RTEMS_DEBUG]) if test x"${RTEMS_DEBUG}" = x"yes"; then AC_DEFINE_UNQUOTED(RTEMS_DEBUG,1,[if RTEMS_DEBUG is enabled]) diff --git a/aclocal/rtems-test-no-pause.m4 b/aclocal/rtems-test-no-pause.m4 new file mode 100644 index 0000000000..c2623e40ac --- /dev/null +++ b/aclocal/rtems-test-no-pause.m4 @@ -0,0 +1,18 @@ +AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE, +[AC_ARG_ENABLE(test-no-pause, +[ --disable-test-no-pause disable RTEMS_TEST_NO_PAUSE], +[case "${enableval}" in + yes) RTEMS_TEST_NO_PAUSE=yes ;; + no) RTEMS_TEST_NO_PAUSE=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for RTEMS_TEST_NO_PAUSE]) ;; +esac],[RTEMS_TEST_NO_PAUSE=no]) +]) + +AC_DEFUN(RTEMS_CHECK_RTEMS_TEST_NO_PAUSE, +[AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE]) +if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes"; +then + AC_DEFINE_UNQUOTED(RTEMS_TEST_NO_PAUSE,1,[if RTEMS_TEST_NO_PAUSE is enabled]) +fi +]) + diff --git a/c/src/exec/configure.in b/c/src/exec/configure.in index f648045d7f..b5c62b66c9 100644 --- a/c/src/exec/configure.in +++ b/c/src/exec/configure.in @@ -69,6 +69,10 @@ fi AC_CONFIG_SUBDIRS($cfg_subdirs) AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU) +RTEMS_DEFINE_POSIX_API +RTEMS_DEFINE_ITRON_API +RTEMS_DEFINE_MULTIPROCESSING + AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h) # Explicitly list all Makefiles here diff --git a/c/src/exec/itron/configure.in b/c/src/exec/itron/configure.in index e34148c2e7..8f789378e5 100644 --- a/c/src/exec/itron/configure.in +++ b/c/src/exec/itron/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-itron,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_ITRON RTEMS_ENABLE_INLINES @@ -26,7 +25,6 @@ RTEMS_PROJECT_ROOT RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_ITRON_API(RTEMS_BSP) # If RTEMS macros are enabled, then use them. Otherwise, use inlines. diff --git a/c/src/exec/posix/configure.in b/c/src/exec/posix/configure.in index dd1dc7b9b8..d68039679d 100644 --- a/c/src/exec/posix/configure.in +++ b/c/src/exec/posix/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-posix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX RTEMS_ENABLE_INLINES diff --git a/c/src/exec/score/cpu/unix/configure.in b/c/src/exec/score/cpu/unix/configure.in index 76e25469e1..a877c061cf 100644 --- a/c/src/exec/score/cpu/unix/configure.in +++ b/c/src/exec/score/cpu/unix/configure.in @@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-unix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING - RTEMS_ENV_RTEMSCPU RTEMS_CHECK_CPU diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in index b86edceb3c..90e4c46d57 100644 --- a/c/src/lib/configure.in +++ b/c/src/lib/configure.in @@ -11,7 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_BARE diff --git a/c/src/lib/libbsp/a29k/portsw/configure.in b/c/src/lib/libbsp/a29k/portsw/configure.in index cf15f86827..099fca2f3b 100644 --- a/c/src/lib/libbsp/a29k/portsw/configure.in +++ b/c/src/lib/libbsp/a29k/portsw/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in index f679af06a5..825ceab3ea 100644 --- a/c/src/lib/libbsp/configure.in +++ b/c/src/lib/libbsp/configure.in @@ -11,7 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_ENABLE_BARE diff --git a/c/src/lib/libbsp/h8300/h8sim/configure.in b/c/src/lib/libbsp/h8300/h8sim/configure.in index bebd61a5f6..5e06052dee 100644 --- a/c/src/lib/libbsp/h8300/h8sim/configure.in +++ b/c/src/lib/libbsp/h8300/h8sim/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in index 89137d7f38..ae75ab151e 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in +++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in index 0de4f5d17e..17140ab5a3 100644 --- a/c/src/lib/libbsp/i960/cvme961/configure.in +++ b/c/src/lib/libbsp/i960/cvme961/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/i960/i960sim/configure.in b/c/src/lib/libbsp/i960/i960sim/configure.in index 050339cef4..c69064a6da 100644 --- a/c/src/lib/libbsp/i960/i960sim/configure.in +++ b/c/src/lib/libbsp/i960/i960sim/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in index 133ca099fe..9fd93aa359 100644 --- a/c/src/lib/libbsp/i960/rxgen960/configure.in +++ b/c/src/lib/libbsp/i960/rxgen960/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in index cbc96c8cdf..b0a7893e5a 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in +++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.in b/c/src/lib/libbsp/powerpc/dmv177/configure.in index dccadc4fee..4aacd1e5fa 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/configure.in +++ b/c/src/lib/libbsp/powerpc/dmv177/configure.in @@ -13,18 +13,15 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") RTEMS_PROJECT_ROOT diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in index 241c776c0c..774d9ee485 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in @@ -13,18 +13,15 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") RTEMS_PROJECT_ROOT diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.in b/c/src/lib/libbsp/powerpc/helas403/configure.in index cfa62fec4b..c2684805c9 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.in +++ b/c/src/lib/libbsp/powerpc/helas403/configure.in @@ -13,18 +13,15 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") RTEMS_PROJECT_ROOT diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.in b/c/src/lib/libbsp/powerpc/mbx8xx/configure.in index e87fa11590..f6923be4c4 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.in +++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.in @@ -12,19 +12,16 @@ AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-mbx8xx,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_LIBCDIR -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") # Explicitly list a Makefile here AC_OUTPUT( diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in index bbfdf37013..cb18939cb4 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in @@ -13,18 +13,15 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") RTEMS_PROJECT_ROOT diff --git a/c/src/lib/libbsp/powerpc/papyrus/configure.in b/c/src/lib/libbsp/powerpc/papyrus/configure.in index 1c1d473a15..b1206aabfe 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/configure.in +++ b/c/src/lib/libbsp/powerpc/papyrus/configure.in @@ -13,18 +13,15 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_NETWORKING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") RTEMS_PROJECT_ROOT diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in index ae966a2b54..0045872136 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/powerpc/psim/configure.in b/c/src/lib/libbsp/powerpc/psim/configure.in index ec50803f96..9364127215 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.in +++ b/c/src/lib/libbsp/powerpc/psim/configure.in @@ -13,7 +13,6 @@ AM_MAINTAINER_MODE RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/c/src/lib/libbsp/unix/posix/configure.in b/c/src/lib/libbsp/unix/posix/configure.in index 7287f9ebe0..a63f020543 100644 --- a/c/src/lib/libbsp/unix/posix/configure.in +++ b/c/src/lib/libbsp/unix/posix/configure.in @@ -12,7 +12,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_CXX -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CANONICAL_HOST diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in index ef027f5574..13c4a55369 100644 --- a/c/src/libmisc/configure.in +++ b/c/src/libmisc/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP diff --git a/c/src/tests/configure.in b/c/src/tests/configure.in index 2bbfb374f7..91592b16fe 100644 --- a/c/src/tests/configure.in +++ b/c/src/tests/configure.in @@ -12,11 +12,9 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_POSIX RTEMS_ENABLE_ITRON RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE diff --git a/c/src/tests/itrontests/configure.in b/c/src/tests/itrontests/configure.in index c71d91c847..657a02a828 100644 --- a/c/src/tests/itrontests/configure.in +++ b/c/src/tests/itrontests/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-itrontests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE diff --git a/c/src/tests/itrontests/itrontests.am b/c/src/tests/itrontests/itrontests.am index 25e96d366b..74bb1078ef 100644 --- a/c/src/tests/itrontests/itrontests.am +++ b/c/src/tests/itrontests/itrontests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/c/src/tests/libtests/configure.in b/c/src/tests/libtests/configure.in index a11a71c8b8..4b33a014fe 100644 --- a/c/src/tests/libtests/configure.in +++ b/c/src/tests/libtests/configure.in @@ -12,12 +12,12 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-libtests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_RTEMS_TEST_NO_PAUSE RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST diff --git a/c/src/tests/libtests/libtests.am b/c/src/tests/libtests/libtests.am index 577bac9fd2..2030f68d6c 100644 --- a/c/src/tests/libtests/libtests.am +++ b/c/src/tests/libtests/libtests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/c/src/tests/mptests/configure.in b/c/src/tests/mptests/configure.in index 73302b76c6..73b4ee45a2 100644 --- a/c/src/tests/mptests/configure.in +++ b/c/src/tests/mptests/configure.in @@ -12,10 +12,8 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-mptests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU diff --git a/c/src/tests/mptests/mp01/node1/Makefile.am b/c/src/tests/mptests/mp01/node1/Makefile.am index fcddeccc68..006791ee11 100644 --- a/c/src/tests/mptests/mp01/node1/Makefile.am +++ b/c/src/tests/mptests/mp01/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp01/node2/Makefile.am b/c/src/tests/mptests/mp01/node2/Makefile.am index 23a4b86a14..0e0a342b2d 100644 --- a/c/src/tests/mptests/mp01/node2/Makefile.am +++ b/c/src/tests/mptests/mp01/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp02/node1/Makefile.am b/c/src/tests/mptests/mp02/node1/Makefile.am index 0644447874..9349ba0029 100644 --- a/c/src/tests/mptests/mp02/node1/Makefile.am +++ b/c/src/tests/mptests/mp02/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp02/node2/Makefile.am b/c/src/tests/mptests/mp02/node2/Makefile.am index 570db75ea2..9386b56482 100644 --- a/c/src/tests/mptests/mp02/node2/Makefile.am +++ b/c/src/tests/mptests/mp02/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp03/node1/Makefile.am b/c/src/tests/mptests/mp03/node1/Makefile.am index 02ab109ef2..582fecb064 100644 --- a/c/src/tests/mptests/mp03/node1/Makefile.am +++ b/c/src/tests/mptests/mp03/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp03/node2/Makefile.am b/c/src/tests/mptests/mp03/node2/Makefile.am index 9ec135eac0..4744e85e00 100644 --- a/c/src/tests/mptests/mp03/node2/Makefile.am +++ b/c/src/tests/mptests/mp03/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp04/node1/Makefile.am b/c/src/tests/mptests/mp04/node1/Makefile.am index f1c48a32dd..e651e12c85 100644 --- a/c/src/tests/mptests/mp04/node1/Makefile.am +++ b/c/src/tests/mptests/mp04/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp04/node2/Makefile.am b/c/src/tests/mptests/mp04/node2/Makefile.am index 601919f21f..1e96e00a47 100644 --- a/c/src/tests/mptests/mp04/node2/Makefile.am +++ b/c/src/tests/mptests/mp04/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp05/node1/Makefile.am b/c/src/tests/mptests/mp05/node1/Makefile.am index a53e9b2c06..8b3d4c7982 100644 --- a/c/src/tests/mptests/mp05/node1/Makefile.am +++ b/c/src/tests/mptests/mp05/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp05/node2/Makefile.am b/c/src/tests/mptests/mp05/node2/Makefile.am index b27b2b81db..2f36e9793f 100644 --- a/c/src/tests/mptests/mp05/node2/Makefile.am +++ b/c/src/tests/mptests/mp05/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am index c0394c36ca..8046e76329 100644 --- a/c/src/tests/mptests/mp06/node1/Makefile.am +++ b/c/src/tests/mptests/mp06/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am index dc2c865598..c97464e677 100644 --- a/c/src/tests/mptests/mp06/node2/Makefile.am +++ b/c/src/tests/mptests/mp06/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp07/node1/Makefile.am b/c/src/tests/mptests/mp07/node1/Makefile.am index fd03da42a8..2cf3d2c56d 100644 --- a/c/src/tests/mptests/mp07/node1/Makefile.am +++ b/c/src/tests/mptests/mp07/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp07/node2/Makefile.am b/c/src/tests/mptests/mp07/node2/Makefile.am index c6d4173459..2620068f27 100644 --- a/c/src/tests/mptests/mp07/node2/Makefile.am +++ b/c/src/tests/mptests/mp07/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp08/node1/Makefile.am b/c/src/tests/mptests/mp08/node1/Makefile.am index 34331f026e..02bc0fa4dc 100644 --- a/c/src/tests/mptests/mp08/node1/Makefile.am +++ b/c/src/tests/mptests/mp08/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp08/node2/Makefile.am b/c/src/tests/mptests/mp08/node2/Makefile.am index dea01f6853..44cce51174 100644 --- a/c/src/tests/mptests/mp08/node2/Makefile.am +++ b/c/src/tests/mptests/mp08/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp09/node1/Makefile.am b/c/src/tests/mptests/mp09/node1/Makefile.am index aaea270e37..d2e175f363 100644 --- a/c/src/tests/mptests/mp09/node1/Makefile.am +++ b/c/src/tests/mptests/mp09/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp09/node2/Makefile.am b/c/src/tests/mptests/mp09/node2/Makefile.am index c9eccac036..8b4c36d222 100644 --- a/c/src/tests/mptests/mp09/node2/Makefile.am +++ b/c/src/tests/mptests/mp09/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp10/node1/Makefile.am b/c/src/tests/mptests/mp10/node1/Makefile.am index 7281b77bcf..c74d08bdc8 100644 --- a/c/src/tests/mptests/mp10/node1/Makefile.am +++ b/c/src/tests/mptests/mp10/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp10/node2/Makefile.am b/c/src/tests/mptests/mp10/node2/Makefile.am index 8750e465dc..f9202bbefa 100644 --- a/c/src/tests/mptests/mp10/node2/Makefile.am +++ b/c/src/tests/mptests/mp10/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp11/node1/Makefile.am b/c/src/tests/mptests/mp11/node1/Makefile.am index f86c54c1b7..83c85c864a 100644 --- a/c/src/tests/mptests/mp11/node1/Makefile.am +++ b/c/src/tests/mptests/mp11/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp11/node2/Makefile.am b/c/src/tests/mptests/mp11/node2/Makefile.am index 35f2608e54..01e208778e 100644 --- a/c/src/tests/mptests/mp11/node2/Makefile.am +++ b/c/src/tests/mptests/mp11/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp12/node1/Makefile.am b/c/src/tests/mptests/mp12/node1/Makefile.am index 9e3e61c6a4..c908401e87 100644 --- a/c/src/tests/mptests/mp12/node1/Makefile.am +++ b/c/src/tests/mptests/mp12/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp12/node2/Makefile.am b/c/src/tests/mptests/mp12/node2/Makefile.am index e860040919..d75f710f4e 100644 --- a/c/src/tests/mptests/mp12/node2/Makefile.am +++ b/c/src/tests/mptests/mp12/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp13/node1/Makefile.am b/c/src/tests/mptests/mp13/node1/Makefile.am index cfd2fa1a46..a85de6898c 100644 --- a/c/src/tests/mptests/mp13/node1/Makefile.am +++ b/c/src/tests/mptests/mp13/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp13/node2/Makefile.am b/c/src/tests/mptests/mp13/node2/Makefile.am index 5be99378aa..0d09a9c642 100644 --- a/c/src/tests/mptests/mp13/node2/Makefile.am +++ b/c/src/tests/mptests/mp13/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp14/node1/Makefile.am b/c/src/tests/mptests/mp14/node1/Makefile.am index e03c43c6ae..a8fa8f2da7 100644 --- a/c/src/tests/mptests/mp14/node1/Makefile.am +++ b/c/src/tests/mptests/mp14/node1/Makefile.am @@ -30,14 +30,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mp14/node2/Makefile.am b/c/src/tests/mptests/mp14/node2/Makefile.am index 6b394e10d0..2381489d1c 100644 --- a/c/src/tests/mptests/mp14/node2/Makefile.am +++ b/c/src/tests/mptests/mp14/node2/Makefile.am @@ -30,14 +30,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/mptests/mptests.am b/c/src/tests/mptests/mptests.am index 815ef8e00d..f7def3bbe0 100644 --- a/c/src/tests/mptests/mptests.am +++ b/c/src/tests/mptests/mptests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/c/src/tests/psxtests/configure.in b/c/src/tests/psxtests/configure.in index 460f7c9d23..8a28b4025d 100644 --- a/c/src/tests/psxtests/configure.in +++ b/c/src/tests/psxtests/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-psxtests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE diff --git a/c/src/tests/psxtests/psxtests.am b/c/src/tests/psxtests/psxtests.am index 15a8e28c9b..dc03d45b16 100644 --- a/c/src/tests/psxtests/psxtests.am +++ b/c/src/tests/psxtests/psxtests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am index fdf0db6e15..3a5a45e9e2 100644 --- a/c/src/tests/samples/base_mp/node1/Makefile.am +++ b/c/src/tests/samples/base_mp/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am index acfe772653..0810138fb8 100644 --- a/c/src/tests/samples/base_mp/node2/Makefile.am +++ b/c/src/tests/samples/base_mp/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/c/src/tests/samples/configure.in b/c/src/tests/samples/configure.in index ddb2c519c5..7f275e8d68 100644 --- a/c/src/tests/samples/configure.in +++ b/c/src/tests/samples/configure.in @@ -12,11 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-samples,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_MULTIPROCESSING -RTEMS_ENABLE_POSIX -RTEMS_ENABLE_ITRON RTEMS_ENABLE_NETWORKING -RTEMS_ENABLE_INLINES RTEMS_ENABLE_CXX RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE @@ -37,7 +33,6 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) -RTEMS_CHECK_POSIX_API(RTEMS_BSP) RTEMS_CHECK_CXX(RTEMS_BSP) AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes") diff --git a/c/src/tests/samples/sample.am b/c/src/tests/samples/sample.am index a294dcc949..dbd1482b9d 100644 --- a/c/src/tests/samples/sample.am +++ b/c/src/tests/samples/sample.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/samples: diff --git a/c/src/tests/sptests/configure.in b/c/src/tests/sptests/configure.in index 0225a1fab1..7d5d9f9a33 100644 --- a/c/src/tests/sptests/configure.in +++ b/c/src/tests/sptests/configure.in @@ -12,11 +12,11 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-sptests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_RTEMS_TEST_NO_PAUSE RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST diff --git a/c/src/tests/sptests/sptests.am b/c/src/tests/sptests/sptests.am index 0ef24f02dc..57a81ea7a0 100644 --- a/c/src/tests/sptests/sptests.am +++ b/c/src/tests/sptests/sptests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/c/src/tests/support/configure.in b/c/src/tests/support/configure.in index c5314c7027..bf2c4f3e06 100644 --- a/c/src/tests/support/configure.in +++ b/c/src/tests/support/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-support,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_POSIX RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST @@ -24,7 +23,6 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) -RTEMS_CHECK_POSIX_API(RTEMS_BSP) AC_SUBST(BARE_CPU_CFLAGS) AC_SUBST(BARE_CPU_MODEL) diff --git a/c/src/tests/tmitrontests/configure.in b/c/src/tests/tmitrontests/configure.in index 01c59e3781..398ac955aa 100644 --- a/c/src/tests/tmitrontests/configure.in +++ b/c/src/tests/tmitrontests/configure.in @@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-tmitrontests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE diff --git a/c/src/tests/tmitrontests/tmitrontests.am b/c/src/tests/tmitrontests/tmitrontests.am index 577bac9fd2..2030f68d6c 100644 --- a/c/src/tests/tmitrontests/tmitrontests.am +++ b/c/src/tests/tmitrontests/tmitrontests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/c/src/tests/tmtests/configure.in b/c/src/tests/tmtests/configure.in index 7c1061ad92..380a322d89 100644 --- a/c/src/tests/tmtests/configure.in +++ b/c/src/tests/tmtests/configure.in @@ -12,11 +12,11 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-tests-tmtests,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_ENABLE_INLINES RTEMS_ENABLE_GCC28 RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSBSP +RTEMS_CHECK_RTEMS_TEST_NO_PAUSE RTEMS_CHECK_CPU RTEMS_CANONICAL_HOST diff --git a/c/src/tests/tmtests/tmtests.am b/c/src/tests/tmtests/tmtests.am index 577bac9fd2..2030f68d6c 100644 --- a/c/src/tests/tmtests/tmtests.am +++ b/c/src/tests/tmtests/tmtests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/make/custom/Cygwin-posix.cfg b/make/custom/Cygwin-posix.cfg index 0f61188e73..1f425311ec 100644 --- a/make/custom/Cygwin-posix.cfg +++ b/make/custom/Cygwin-posix.cfg @@ -31,14 +31,10 @@ CFLAGS_OPTIMIZE_V = -O2 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # RTEMS_UNIX (unix) # Define this to indicate this is an RTEMS UNIX port. define make-target-options - echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ echo "#define RTEMS_UNIX 1 " >>$@ endef @@ -48,6 +44,5 @@ define make-exe $(SIZE) $@ endef - # ***************************************************************** # Miscellaneous additions go here diff --git a/make/custom/FreeBSD-posix.cfg b/make/custom/FreeBSD-posix.cfg index 80611b5507..944cc24cba 100644 --- a/make/custom/FreeBSD-posix.cfg +++ b/make/custom/FreeBSD-posix.cfg @@ -1,7 +1,5 @@ # # Config file for the FreeBSD 2.x based RTEMS UNIX -# -# RTEMS_CPU=unix RTEMS_CPU_FAMILY=i386 @@ -22,21 +20,16 @@ LIBC_DEFINES+=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED LIBC_DEFINES += -DWORKSPACE_MB=2 LIBC_DEFINES += -DHEAPSPACE_MB=1 - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V = -O2 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # RTEMS_UNIX (unix) # Define this to indicate this is an RTEMS UNIX port. define make-target-options - echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ echo "#define RTEMS_UNIX 1 " >>$@ endef @@ -46,6 +39,5 @@ define make-exe $(SIZE) $@ endef - # ***************************************************************** # Miscellaneous additions go here diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg index a8ed92016d..1aa6dead4f 100644 --- a/make/custom/HPUX9-posix.cfg +++ b/make/custom/HPUX9-posix.cfg @@ -35,14 +35,10 @@ CFLAGS_OPTIMIZE_V = -O2 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # RTEMS_UNIX (unix) # Define this to indicate this is an RTEMS UNIX port. define make-target-options - echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ echo "#define RTEMS_UNIX 1 " >>$@ endef diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg index 75107a4499..f86b4f2e70 100644 --- a/make/custom/Linux-posix.cfg +++ b/make/custom/Linux-posix.cfg @@ -31,14 +31,10 @@ CFLAGS_OPTIMIZE_V = -O2 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # RTEMS_UNIX (unix) # Define this to indicate this is an RTEMS UNIX port. define make-target-options - echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ echo "#define RTEMS_UNIX 1 " >>$@ endef @@ -48,6 +44,5 @@ define make-exe $(SIZE) $@ endef - # ***************************************************************** # Miscellaneous additions go here diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index a43465c76e..5b183d745f 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -28,14 +28,10 @@ CFLAGS_OPTIMIZE_V = -O2 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # RTEMS_UNIX (unix) # Define this to indicate this is an RTEMS UNIX port. define make-target-options - echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ echo "#define RTEMS_UNIX 1 " >>$@ endef @@ -47,5 +43,4 @@ endef # ***************************************************************** - # Miscellaneous additions go here diff --git a/make/custom/bare.cfg b/make/custom/bare.cfg index 64e73268f5..5ec1a6fb52 100644 --- a/make/custom/bare.cfg +++ b/make/custom/bare.cfg @@ -21,12 +21,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # this target has no start file diff --git a/make/custom/cvme961.cfg b/make/custom/cvme961.cfg index 8d154c1e88..efa76f66fb 100644 --- a/make/custom/cvme961.cfg +++ b/make/custom/cvme961.cfg @@ -27,12 +27,7 @@ CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/dmv152.cfg b/make/custom/dmv152.cfg index 5d93e5ac49..aeae57065b 100644 --- a/make/custom/dmv152.cfg +++ b/make/custom/dmv152.cfg @@ -28,17 +28,12 @@ BSP_CPPFLAGS = -DUSE_CHANNEL_A CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. - -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # USE_CHANNEL_A (DMV152) # USE_CHANNEL_B (DMV152) # One and only one of these should be set to 1 to indicate which # serial port is used as the RTEMS console. define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ # @echo "#define USE_CHANNEL_A 1" >>$@ # @echo "#define USE_CHANNEL_B 0" >>$@ endef diff --git a/make/custom/dmv177.cfg b/make/custom/dmv177.cfg index 9fbe7ba649..452ac13478 100644 --- a/make/custom/dmv177.cfg +++ b/make/custom/dmv177.cfg @@ -18,9 +18,6 @@ RTEMS_BSP_FAMILY=dmv177 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # CONSOLE_USE_POLLED (psim_bsp) # CONSOLE_USE_INTERRUPTS (psim_bsp) # The psim console driver has the structure to operate in either @@ -52,7 +49,6 @@ RTEMS_BSP_FAMILY=dmv177 # The BSP actually contains the call that enables this. define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@ @echo "#define PPC_VECTOR_FILE_BASE 0x0100" >>$@ diff --git a/make/custom/efi332.cfg b/make/custom/efi332.cfg index f537959af8..c62ef47b86 100644 --- a/make/custom/efi332.cfg +++ b/make/custom/efi332.cfg @@ -21,12 +21,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as @@ -55,5 +50,4 @@ define make-exe endef endif - # Miscellaneous additions go here diff --git a/make/custom/efi68k.cfg b/make/custom/efi68k.cfg index f4d6eee6e8..50c9880513 100644 --- a/make/custom/efi68k.cfg +++ b/make/custom/efi68k.cfg @@ -25,12 +25,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/erc32.cfg b/make/custom/erc32.cfg index 801a8c5fcc..bc8b7ab533 100644 --- a/make/custom/erc32.cfg +++ b/make/custom/erc32.cfg @@ -30,9 +30,6 @@ CFLAGS_OPTIMIZE_V=-O4 # This makes the target dependent options file -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # NO_TABLE_MOVE (SPARC PORT) # do not have a second trap table -- use the BSP's # @@ -55,7 +52,6 @@ CFLAGS_OPTIMIZE_V=-O4 # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define NO_TABLE_MOVE 1" >>$@ @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@ @@ -63,8 +59,6 @@ define make-target-options @echo "#define FPU_REVB 1" >>$@ endef - - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. diff --git a/make/custom/eth_comm.cfg b/make/custom/eth_comm.cfg index d87285ad05..00575e539d 100644 --- a/make/custom/eth_comm.cfg +++ b/make/custom/eth_comm.cfg @@ -17,9 +17,6 @@ CPU_DEFINES= # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # PPC_VECTOR_FILE_BASE (PowerPC) # This defines the base address of the exception table. # NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 @@ -45,7 +42,6 @@ define make-target-options @echo "#endif" >>$@ @echo "#define mpc$(CPU_TYPE) 1" >>$@ @echo >>$@ - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define PPC_VECTOR_FILE_BASE 0x0000" >>$@ @echo "#define PPC_ABI PPC_ABI_EABI" >>$@ @echo "#define PPC_ASM PPC_ASM_ELF" >>$@ @@ -88,4 +84,3 @@ endif # Miscellaneous additions go here - diff --git a/make/custom/gen68302.cfg b/make/custom/gen68302.cfg index 1fa979dcb7..776e19d275 100644 --- a/make/custom/gen68302.cfg +++ b/make/custom/gen68302.cfg @@ -26,12 +26,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/gen68340.cfg b/make/custom/gen68340.cfg index a4dde4be34..b355b61e6d 100644 --- a/make/custom/gen68340.cfg +++ b/make/custom/gen68340.cfg @@ -20,12 +20,8 @@ CPU_CFLAGS = -mcpu32 CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as @@ -71,5 +67,4 @@ endef # $(basename $@).exe $(basename $@).ieee endif - # Miscellaneous additions go here diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg index eba370c9d9..bc83d07b84 100644 --- a/make/custom/gen68360.cfg +++ b/make/custom/gen68360.cfg @@ -32,17 +32,11 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes) define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef else define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define RTEMS__mcpu32p__ 1" >>$@ endef endif @@ -76,5 +70,4 @@ define make-exe endef endif - # Miscellaneous additions go here diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg index 44b65697e6..7d2ef2580d 100644 --- a/make/custom/gensh1.cfg +++ b/make/custom/gensh1.cfg @@ -38,15 +38,9 @@ CFLAGS_OPTIMIZE_V = -O4 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. diff --git a/make/custom/gensh2.cfg b/make/custom/gensh2.cfg index 8c3144e0c0..c79491b4a4 100644 --- a/make/custom/gensh2.cfg +++ b/make/custom/gensh2.cfg @@ -41,9 +41,6 @@ CFLAGS_OPTIMIZE_V = -O4 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # STANDALONE_EVB # This switch compiles code to jump-start from FLASH, without a monitor # @@ -53,13 +50,11 @@ CFLAGS_OPTIMIZE_V = -O4 # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define RTEMS_TEST_IO_STREAM 1" >>$@ @echo "/* #define STANDALONE_EVB 1 */" >>$@ @echo "#define START_HW_INIT 1" >>$@ endef - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. diff --git a/make/custom/h8sim.cfg b/make/custom/h8sim.cfg index bd22ae04dd..48583873b3 100644 --- a/make/custom/h8sim.cfg +++ b/make/custom/h8sim.cfg @@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O0 -g # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/helas403.cfg b/make/custom/helas403.cfg index 755e5dbfb0..02758eaa23 100644 --- a/make/custom/helas403.cfg +++ b/make/custom/helas403.cfg @@ -20,9 +20,6 @@ RTEMS_BSP_FAMILY=helas403 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # PPC_VECTOR_FILE_BASE (PowerPC) # This defines the base address of the exception table. # NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 @@ -34,7 +31,6 @@ RTEMS_BSP_FAMILY=helas403 # other tools like debuggers. define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define PPC_VECTOR_FILE_BASE 0x0100" >>$@ @echo "#define PPC_USE_SPRG 1" >>$@ endef @@ -78,4 +74,3 @@ endif # Miscellaneous additions go here - diff --git a/make/custom/i386ex.cfg b/make/custom/i386ex.cfg index 7879487145..ff2535d750 100644 --- a/make/custom/i386ex.cfg +++ b/make/custom/i386ex.cfg @@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O4 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # Something like this should produce a map file but this does not work. diff --git a/make/custom/i960sim.cfg b/make/custom/i960sim.cfg index 86eb36e43a..25e67cda47 100644 --- a/make/custom/i960sim.cfg +++ b/make/custom/i960sim.cfg @@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O0 -g # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/idp.cfg b/make/custom/idp.cfg index a23e3b70f3..e8246006ff 100644 --- a/make/custom/idp.cfg +++ b/make/custom/idp.cfg @@ -14,12 +14,7 @@ RTEMS_BSP_FAMILY=idp # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # This contains the compiler options necessary to select the CPU model diff --git a/make/custom/mbx860_005b.cfg b/make/custom/mbx860_005b.cfg index 7dd7544b7a..c588da453c 100644 --- a/make/custom/mbx860_005b.cfg +++ b/make/custom/mbx860_005b.cfg @@ -30,5 +30,4 @@ define make-target-options @echo "#define PPC_USE_SPRG 0" >>$@ @echo "/* #define PPC_USE_DATA_CACHE 1" */ >>$@ @echo >>$@ - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg index 5a4fc23e40..2522570790 100644 --- a/make/custom/mbx8xx.cfg +++ b/make/custom/mbx8xx.cfg @@ -104,11 +104,6 @@ endif # mbx821 # If defined, then the PowerPC specific code in RTEMS will use # data cache instructions to optimize the context switch code. # This code can conflict with debuggers or emulators. -# -# RTEMS generic options: -# -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# If defined, do not pause between screens of output in the rtems tests. define make-target-options @echo "#ifdef mpc$(CPU_TYPE)" >>$@ @@ -127,7 +122,6 @@ define make-target-options @echo "#define PPC_USE_SPRG 0" >>$@ @echo "/* #define PPC_USE_DATA_CACHE 1" */ >>$@ @echo >>$@ - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # This contains the compiler options necessary to select the CPU model diff --git a/make/custom/mcp750.cfg b/make/custom/mcp750.cfg index 48720f2bbf..95057ba777 100644 --- a/make/custom/mcp750.cfg +++ b/make/custom/mcp750.cfg @@ -15,9 +15,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # PPC_VECTOR_FILE_BASE (ppc) # This defines the base address of the exception table. # NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 @@ -35,7 +32,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define PPCN_60X_USE_DINK 0" >>$@ @echo "#define PPCN_60X_USE_NONE 1" >>$@ @echo "#define PPC_USE_DATA_CACHE 1" >>$@ @@ -66,7 +62,6 @@ CFLAGS_OPTIMIZE_V=-O4 -mmultiple -mstring -mstrict-align # BSP using inlined code CFLAGS_DEBUG_V = -O1 -mmultiple -mstring -mstrict-align - # The following is a ld command file which works without using the # -specs system in gcc 2.8. IT HAS NEVER BEEN TESTED WITH THIS BSP!!! # $(LD) $(XLDFLAGS) -T $(LINKCMDS) \ diff --git a/make/custom/mvme136.cfg b/make/custom/mvme136.cfg index 5a72e0ce48..1e9741de26 100644 --- a/make/custom/mvme136.cfg +++ b/make/custom/mvme136.cfg @@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as @@ -59,5 +54,3 @@ endef endif # Miscellaneous additions go here - - diff --git a/make/custom/mvme147.cfg b/make/custom/mvme147.cfg index dbe2905742..06dd46cbb3 100644 --- a/make/custom/mvme147.cfg +++ b/make/custom/mvme147.cfg @@ -21,12 +21,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as @@ -56,4 +51,3 @@ endef endif # Miscellaneous additions go here - diff --git a/make/custom/mvme162.cfg b/make/custom/mvme162.cfg index 23775ef3ae..2470dc3b8d 100644 --- a/make/custom/mvme162.cfg +++ b/make/custom/mvme162.cfg @@ -42,13 +42,9 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests - define make-target-options @echo "#undef $(RTEMS_MVME162_MODEL)" >>$@ @echo "#define $(RTEMS_MVME162_MODEL)" >>$@ - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/mvme167.cfg b/make/custom/mvme167.cfg index 383bedc8d7..0ef9a49cd9 100644 --- a/make/custom/mvme167.cfg +++ b/make/custom/mvme167.cfg @@ -35,9 +35,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # CD2401_INT_LEVEL # Interrupt level for the CD2401. # @@ -45,7 +42,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer # 0 for interrupt-driven, 1 for polled I/O. define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ # @echo "#define CD2401_INT_LEVEL 1" >>$@ # @echo "#define CD2401_POLLED_IO 1" >>$@ diff --git a/make/custom/mvme2307.cfg b/make/custom/mvme2307.cfg index 1afb42527a..00c8d61417 100644 --- a/make/custom/mvme2307.cfg +++ b/make/custom/mvme2307.cfg @@ -15,9 +15,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # CONSOLE_USE_POLLED (mvme2307_bsp) # CONSOLE_USE_INTERRUPTS (mvme2307_bsp) # The mvme2307 console driver has the structure to operate in either @@ -36,7 +33,6 @@ RTEMS_BSP_FAMILY=motorola_powerpc # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define PPCN_60X_USE_DINK 0" >>$@ @echo "#define PPCN_60X_USE_NONE 1" >>$@ @echo "#define PPC_USE_DATA_CACHE 1" >>$@ @@ -92,7 +88,6 @@ define make-exe # ${PROJECT_RELEASE}/bin/$${f}$(LIB_VARIANT).exe endef - # Miscellaneous additions go here # No start file diff --git a/make/custom/ods68302.cfg b/make/custom/ods68302.cfg index fd9fb89260..32107fbd56 100644 --- a/make/custom/ods68302.cfg +++ b/make/custom/ods68302.cfg @@ -37,12 +37,7 @@ CFLAGS_DEBUG_V = # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/p4000.cfg b/make/custom/p4000.cfg index ff97e1a5f8..32e10086a5 100644 --- a/make/custom/p4000.cfg +++ b/make/custom/p4000.cfg @@ -13,15 +13,9 @@ RTEMS_BSP_FAMILY=p4000 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer diff --git a/make/custom/p4600.cfg b/make/custom/p4600.cfg index d9df2f90d9..a2b8437117 100644 --- a/make/custom/p4600.cfg +++ b/make/custom/p4600.cfg @@ -19,15 +19,9 @@ CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer diff --git a/make/custom/p4650.cfg b/make/custom/p4650.cfg index b8a1443581..be6c4525ef 100644 --- a/make/custom/p4650.cfg +++ b/make/custom/p4650.cfg @@ -19,15 +19,9 @@ CPU_DEFINES+=-DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef - # optimize flag: typically -0, could use -O4 or -fast # -O4 is ok for RTEMS CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer diff --git a/make/custom/papyrus.cfg b/make/custom/papyrus.cfg index 9114bf8738..569acf9802 100644 --- a/make/custom/papyrus.cfg +++ b/make/custom/papyrus.cfg @@ -14,9 +14,6 @@ RTEMS_BSP_FAMILY=papyrus # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # PPC_VECTOR_FILE_BASE (PowerPC) # This defines the base address of the exception table. # NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 @@ -28,7 +25,6 @@ RTEMS_BSP_FAMILY=papyrus # other tools like debuggers. define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define PPC_VECTOR_FILE_BASE 0x0100" >>$@ @echo "#define PPC_USE_SPRG 1" >>$@ endef @@ -72,4 +68,3 @@ endif # Miscellaneous additions go here - diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg index 8bf4440012..94127a9bd4 100644 --- a/make/custom/pc386.cfg +++ b/make/custom/pc386.cfg @@ -27,12 +27,7 @@ CFLAGS_OPTIMIZE_V=-O4 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "/* #define RTEMS_TEST_NO_PAUSE 1 */" >>$@ endef # Here is the rule to actually build a $(ARCH)/foo.exe diff --git a/make/custom/portsw.cfg b/make/custom/portsw.cfg index 8322ba5944..35562800d3 100644 --- a/make/custom/portsw.cfg +++ b/make/custom/portsw.cfg @@ -16,15 +16,9 @@ RTEMS_BSP_FAMILY=portsw # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef - ifeq ($(RTEMS_USE_GCC272),yes) define make-exe $(LD) $(LDFLAGS) -N -e _start \ diff --git a/make/custom/ppcn_60x.cfg b/make/custom/ppcn_60x.cfg index 82ef22ab7b..67f6ca037a 100644 --- a/make/custom/ppcn_60x.cfg +++ b/make/custom/ppcn_60x.cfg @@ -16,9 +16,6 @@ RTEMS_BSP_FAMILY=ppcn_60x # This contains the compiler options necessary to select the CPU model # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # PPCN_60X_USE_DINK (ppcn_60x_bsp) # PPCN_60X_USE_NONE (ppcn_60x_bsp) # The Score603e board can be configured with 3 ROM monitors. Only two @@ -42,7 +39,6 @@ RTEMS_BSP_FAMILY=ppcn_60x # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define PPCN_60X_USE_DINK 1" >>$@ @echo "#define PPCN_60X_USE_NONE 0" >>$@ @echo "#define PPC_USE_DATA_CACHE 1" >>$@ diff --git a/make/custom/psim.cfg b/make/custom/psim.cfg index 9644c189b4..1ea53d2f64 100644 --- a/make/custom/psim.cfg +++ b/make/custom/psim.cfg @@ -14,9 +14,6 @@ RTEMS_BSP_FAMILY=psim # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # CONSOLE_USE_POLLED (psim_bsp) # CONSOLE_USE_INTERRUPTS (psim_bsp) # The psim console driver has the structure to operate in either @@ -38,10 +35,7 @@ RTEMS_BSP_FAMILY=psim # response time. The use of these registers can conflict with # other tools like debuggers. - - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@ @echo "#define PSIM_FAST_IDLE 1" >>$@ diff --git a/make/custom/rxgen960.cfg b/make/custom/rxgen960.cfg index 079ad54ecb..55284396dc 100644 --- a/make/custom/rxgen960.cfg +++ b/make/custom/rxgen960.cfg @@ -28,11 +28,7 @@ CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests - define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ endef # The following are definitions of make-exe which will work using ld as diff --git a/make/custom/score603e.cfg b/make/custom/score603e.cfg index 699184847c..a7db5b1c8d 100644 --- a/make/custom/score603e.cfg +++ b/make/custom/score603e.cfg @@ -15,7 +15,6 @@ ifeq ($(SCORE603E_GENERATION),) SCORE603E_GENERATION=2 endif - # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=score603e @@ -34,9 +33,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # CONSOLE_USE_POLLED (score603e_bsp) # CONSOLE_USE_INTERRUPTS (score603e_bsp) # The score603e console driver has the structure to operate in either @@ -67,7 +63,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define CONSOLE_USE_INTERRUPTS 0" >>$@ @echo "#define INITIALIZE_COM_PORTS 1" >>$@ @echo "#define SCORE603E_GENERATION $(SCORE603E_GENERATION)" >>$@ diff --git a/make/custom/simhppa.cfg b/make/custom/simhppa.cfg index 39f3f7df40..375143d166 100644 --- a/make/custom/simhppa.cfg +++ b/make/custom/simhppa.cfg @@ -37,9 +37,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions # This makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # SIMHPPA_FAST_IDLE (simhppa) # If defined, speed up the clock ticks while the idle task is running so # time spent in the idle task is minimized. This significantly reduces @@ -47,7 +44,6 @@ CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions # define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "#define SIMHPPA_FAST_IDLE 1 " >>$@ endef @@ -93,7 +89,6 @@ LD_LOC_OPTIONS=-Tdata $(DATA_$(NODE)_BASE) -Ttext $(TEXT_$(NODE)_BASE) GCC_LD_LOC_OPTIONS=-W,l-T -W,ldata -W,l$(DATA_$(NODE)_BASE) \ -W,l-T -W,ltext -W,l$(TEXT_$(NODE)_BASE) - # The following are definitions of make-exe which will work using ld as # is currently required. It is expected that as of gcc 2.8, the end user # will be able to override parts of the compilers specs and link using gcc. diff --git a/make/custom/ts_386ex.cfg b/make/custom/ts_386ex.cfg index 689c53686e..b9f47babc2 100644 --- a/make/custom/ts_386ex.cfg +++ b/make/custom/ts_386ex.cfg @@ -25,9 +25,6 @@ CFLAGS_OPTIMIZE_V= -O4 # This section makes the target dependent options file. -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# # BSP_DEBUG (BSP) # Enables some debugging in the BSP package. # @@ -36,7 +33,6 @@ CFLAGS_OPTIMIZE_V= -O4 # some tests. define make-target-options - @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ @echo "/* #define UARTDEBUG 1 */" >>$@ @echo "/* #define BSP_DEBUG 1 */" >>$@ @echo "#define LOAD_RTC_AT_START 1" >>$@ diff --git a/testsuites/itrontests/itrontests.am b/testsuites/itrontests/itrontests.am index 25e96d366b..74bb1078ef 100644 --- a/testsuites/itrontests/itrontests.am +++ b/testsuites/itrontests/itrontests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/testsuites/libtests/libtests.am b/testsuites/libtests/libtests.am index 577bac9fd2..2030f68d6c 100644 --- a/testsuites/libtests/libtests.am +++ b/testsuites/libtests/libtests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am index fcddeccc68..006791ee11 100644 --- a/testsuites/mptests/mp01/node1/Makefile.am +++ b/testsuites/mptests/mp01/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am index 23a4b86a14..0e0a342b2d 100644 --- a/testsuites/mptests/mp01/node2/Makefile.am +++ b/testsuites/mptests/mp01/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am index 0644447874..9349ba0029 100644 --- a/testsuites/mptests/mp02/node1/Makefile.am +++ b/testsuites/mptests/mp02/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am index 570db75ea2..9386b56482 100644 --- a/testsuites/mptests/mp02/node2/Makefile.am +++ b/testsuites/mptests/mp02/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am index 02ab109ef2..582fecb064 100644 --- a/testsuites/mptests/mp03/node1/Makefile.am +++ b/testsuites/mptests/mp03/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am index 9ec135eac0..4744e85e00 100644 --- a/testsuites/mptests/mp03/node2/Makefile.am +++ b/testsuites/mptests/mp03/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am index f1c48a32dd..e651e12c85 100644 --- a/testsuites/mptests/mp04/node1/Makefile.am +++ b/testsuites/mptests/mp04/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am index 601919f21f..1e96e00a47 100644 --- a/testsuites/mptests/mp04/node2/Makefile.am +++ b/testsuites/mptests/mp04/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am index a53e9b2c06..8b3d4c7982 100644 --- a/testsuites/mptests/mp05/node1/Makefile.am +++ b/testsuites/mptests/mp05/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am index b27b2b81db..2f36e9793f 100644 --- a/testsuites/mptests/mp05/node2/Makefile.am +++ b/testsuites/mptests/mp05/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am index c0394c36ca..8046e76329 100644 --- a/testsuites/mptests/mp06/node1/Makefile.am +++ b/testsuites/mptests/mp06/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am index dc2c865598..c97464e677 100644 --- a/testsuites/mptests/mp06/node2/Makefile.am +++ b/testsuites/mptests/mp06/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am index fd03da42a8..2cf3d2c56d 100644 --- a/testsuites/mptests/mp07/node1/Makefile.am +++ b/testsuites/mptests/mp07/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am index c6d4173459..2620068f27 100644 --- a/testsuites/mptests/mp07/node2/Makefile.am +++ b/testsuites/mptests/mp07/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am index 34331f026e..02bc0fa4dc 100644 --- a/testsuites/mptests/mp08/node1/Makefile.am +++ b/testsuites/mptests/mp08/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am index dea01f6853..44cce51174 100644 --- a/testsuites/mptests/mp08/node2/Makefile.am +++ b/testsuites/mptests/mp08/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am index aaea270e37..d2e175f363 100644 --- a/testsuites/mptests/mp09/node1/Makefile.am +++ b/testsuites/mptests/mp09/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am index c9eccac036..8b4c36d222 100644 --- a/testsuites/mptests/mp09/node2/Makefile.am +++ b/testsuites/mptests/mp09/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am index 7281b77bcf..c74d08bdc8 100644 --- a/testsuites/mptests/mp10/node1/Makefile.am +++ b/testsuites/mptests/mp10/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am index 8750e465dc..f9202bbefa 100644 --- a/testsuites/mptests/mp10/node2/Makefile.am +++ b/testsuites/mptests/mp10/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am index f86c54c1b7..83c85c864a 100644 --- a/testsuites/mptests/mp11/node1/Makefile.am +++ b/testsuites/mptests/mp11/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am index 35f2608e54..01e208778e 100644 --- a/testsuites/mptests/mp11/node2/Makefile.am +++ b/testsuites/mptests/mp11/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am index 9e3e61c6a4..c908401e87 100644 --- a/testsuites/mptests/mp12/node1/Makefile.am +++ b/testsuites/mptests/mp12/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am index e860040919..d75f710f4e 100644 --- a/testsuites/mptests/mp12/node2/Makefile.am +++ b/testsuites/mptests/mp12/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am index cfd2fa1a46..a85de6898c 100644 --- a/testsuites/mptests/mp13/node1/Makefile.am +++ b/testsuites/mptests/mp13/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am index 5be99378aa..0d09a9c642 100644 --- a/testsuites/mptests/mp13/node2/Makefile.am +++ b/testsuites/mptests/mp13/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am index e03c43c6ae..a8fa8f2da7 100644 --- a/testsuites/mptests/mp14/node1/Makefile.am +++ b/testsuites/mptests/mp14/node1/Makefile.am @@ -30,14 +30,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am index 6b394e10d0..2381489d1c 100644 --- a/testsuites/mptests/mp14/node2/Makefile.am +++ b/testsuites/mptests/mp14/node2/Makefile.am @@ -30,14 +30,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/mptests.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/mptests/mptests.am b/testsuites/mptests/mptests.am index 815ef8e00d..f7def3bbe0 100644 --- a/testsuites/mptests/mptests.am +++ b/testsuites/mptests/mptests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/testsuites/psxtests/psxtests.am b/testsuites/psxtests/psxtests.am index 15a8e28c9b..dc03d45b16 100644 --- a/testsuites/psxtests/psxtests.am +++ b/testsuites/psxtests/psxtests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am index fdf0db6e15..3a5a45e9e2 100644 --- a/testsuites/samples/base_mp/node1/Makefile.am +++ b/testsuites/samples/base_mp/node1/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am index acfe772653..0810138fb8 100644 --- a/testsuites/samples/base_mp/node2/Makefile.am +++ b/testsuites/samples/base_mp/node2/Makefile.am @@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(RTEMS_ROOT)/make/leaf.cfg include $(top_srcdir)/sample.am +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. + if HAS_MP # # (OPTIONAL) Add local stuff here using += # -AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I. - ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) diff --git a/testsuites/samples/sample.am b/testsuites/samples/sample.am index a294dcc949..dbd1482b9d 100644 --- a/testsuites/samples/sample.am +++ b/testsuites/samples/sample.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/samples: diff --git a/testsuites/sptests/sptests.am b/testsuites/sptests/sptests.am index 0ef24f02dc..57a81ea7a0 100644 --- a/testsuites/sptests/sptests.am +++ b/testsuites/sptests/sptests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/testsuites/tmitrontests/tmitrontests.am b/testsuites/tmitrontests/tmitrontests.am index 577bac9fd2..2030f68d6c 100644 --- a/testsuites/tmitrontests/tmitrontests.am +++ b/testsuites/tmitrontests/tmitrontests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: diff --git a/testsuites/tmtests/tmtests.am b/testsuites/tmtests/tmtests.am index 577bac9fd2..2030f68d6c 100644 --- a/testsuites/tmtests/tmtests.am +++ b/testsuites/tmtests/tmtests.am @@ -1,3 +1,5 @@ +AM_CPPFLAGS += @DEFS@ + project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@ $(project_bspdir)/tests: -- cgit v1.2.3