From b3874e1531831dc587705e52f74f1f1621d76e45 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 12 Oct 2017 09:04:17 +0200 Subject: ada-tests: Use _SUBDIRS instead of SUBDIRS Update #3079. --- c/src/ada-tests/Makefile.am | 4 +- c/src/ada-tests/mptests/Makefile.am | 28 +++++++------- c/src/ada-tests/mptests/mp01/Makefile.am | 2 +- c/src/ada-tests/mptests/mp03/Makefile.am | 2 +- c/src/ada-tests/mptests/mp04/Makefile.am | 2 +- c/src/ada-tests/mptests/mp05/Makefile.am | 2 +- c/src/ada-tests/mptests/mp06/Makefile.am | 2 +- c/src/ada-tests/mptests/mp07/Makefile.am | 2 +- c/src/ada-tests/mptests/mp08/Makefile.am | 2 +- c/src/ada-tests/mptests/mp09/Makefile.am | 2 +- c/src/ada-tests/mptests/mp10/Makefile.am | 2 +- c/src/ada-tests/mptests/mp11/Makefile.am | 2 +- c/src/ada-tests/mptests/mp12/Makefile.am | 2 +- c/src/ada-tests/mptests/mp13/Makefile.am | 2 +- c/src/ada-tests/mptests/mp14/Makefile.am | 2 +- c/src/ada-tests/samples/Makefile.am | 4 +- c/src/ada-tests/samples/base_mp/Makefile.am | 2 +- c/src/ada-tests/sptests/Makefile.am | 50 ++++++++++++------------ c/src/ada-tests/tmtests/Makefile.am | 60 ++++++++++++++--------------- 19 files changed, 87 insertions(+), 87 deletions(-) diff --git a/c/src/ada-tests/Makefile.am b/c/src/ada-tests/Makefile.am index 758679362b..f097f9fa0c 100644 --- a/c/src/ada-tests/Makefile.am +++ b/c/src/ada-tests/Makefile.am @@ -1,8 +1,8 @@ ACLOCAL_AMFLAGS = -I aclocal -I ../../../testsuites/aclocal -SUBDIRS = support samples sptests tmtests +_SUBDIRS = support samples sptests tmtests if HAS_MP -SUBDIRS += mptests +_SUBDIRS += mptests endif DIST_SUBDIRS = support samples sptests tmtests mptests diff --git a/c/src/ada-tests/mptests/Makefile.am b/c/src/ada-tests/mptests/Makefile.am index 970f732881..17999ae43f 100644 --- a/c/src/ada-tests/mptests/Makefile.am +++ b/c/src/ada-tests/mptests/Makefile.am @@ -1,17 +1,17 @@ -SUBDIRS = -SUBDIRS += mp01 -SUBDIRS += mp03 -SUBDIRS += mp04 -SUBDIRS += mp05 -SUBDIRS += mp06 -SUBDIRS += mp07 -SUBDIRS += mp08 -SUBDIRS += mp09 -SUBDIRS += mp10 -SUBDIRS += mp11 -SUBDIRS += mp12 -SUBDIRS += mp13 -SUBDIRS += mp14 +_SUBDIRS = +_SUBDIRS += mp01 +_SUBDIRS += mp03 +_SUBDIRS += mp04 +_SUBDIRS += mp05 +_SUBDIRS += mp06 +_SUBDIRS += mp07 +_SUBDIRS += mp08 +_SUBDIRS += mp09 +_SUBDIRS += mp10 +_SUBDIRS += mp11 +_SUBDIRS += mp12 +_SUBDIRS += mp13 +_SUBDIRS += mp14 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp01/Makefile.am b/c/src/ada-tests/mptests/mp01/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp01/Makefile.am +++ b/c/src/ada-tests/mptests/mp01/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp03/Makefile.am b/c/src/ada-tests/mptests/mp03/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp03/Makefile.am +++ b/c/src/ada-tests/mptests/mp03/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp04/Makefile.am b/c/src/ada-tests/mptests/mp04/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp04/Makefile.am +++ b/c/src/ada-tests/mptests/mp04/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp05/Makefile.am b/c/src/ada-tests/mptests/mp05/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp05/Makefile.am +++ b/c/src/ada-tests/mptests/mp05/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp06/Makefile.am b/c/src/ada-tests/mptests/mp06/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp06/Makefile.am +++ b/c/src/ada-tests/mptests/mp06/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp07/Makefile.am b/c/src/ada-tests/mptests/mp07/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp07/Makefile.am +++ b/c/src/ada-tests/mptests/mp07/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp08/Makefile.am b/c/src/ada-tests/mptests/mp08/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp08/Makefile.am +++ b/c/src/ada-tests/mptests/mp08/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp09/Makefile.am b/c/src/ada-tests/mptests/mp09/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp09/Makefile.am +++ b/c/src/ada-tests/mptests/mp09/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp10/Makefile.am b/c/src/ada-tests/mptests/mp10/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp10/Makefile.am +++ b/c/src/ada-tests/mptests/mp10/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp11/Makefile.am b/c/src/ada-tests/mptests/mp11/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp11/Makefile.am +++ b/c/src/ada-tests/mptests/mp11/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp12/Makefile.am b/c/src/ada-tests/mptests/mp12/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp12/Makefile.am +++ b/c/src/ada-tests/mptests/mp12/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp13/Makefile.am b/c/src/ada-tests/mptests/mp13/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp13/Makefile.am +++ b/c/src/ada-tests/mptests/mp13/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/mptests/mp14/Makefile.am b/c/src/ada-tests/mptests/mp14/Makefile.am index 0ad1000d4d..43bba78abb 100644 --- a/c/src/ada-tests/mptests/mp14/Makefile.am +++ b/c/src/ada-tests/mptests/mp14/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/samples/Makefile.am b/c/src/ada-tests/samples/Makefile.am index a292ae616e..c41a4b4af8 100644 --- a/c/src/ada-tests/samples/Makefile.am +++ b/c/src/ada-tests/samples/Makefile.am @@ -1,7 +1,7 @@ -SUBDIRS = hello ticker base_sp nsecs +_SUBDIRS = hello ticker base_sp nsecs if HAS_MP -SUBDIRS += base_mp +_SUBDIRS += base_mp endif DIST_SUBDIRS = hello ticker base_sp base_mp nsecs diff --git a/c/src/ada-tests/samples/base_mp/Makefile.am b/c/src/ada-tests/samples/base_mp/Makefile.am index 8621f194d9..caf05e5fb0 100644 --- a/c/src/ada-tests/samples/base_mp/Makefile.am +++ b/c/src/ada-tests/samples/base_mp/Makefile.am @@ -1,7 +1,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../testsuites/automake/compile.am -SUBDIRS = node1 node2 +_SUBDIRS = node1 node2 #include $(top_srcdir)/ada.am #mptest$(EXEEXT): mptest.adb diff --git a/c/src/ada-tests/sptests/Makefile.am b/c/src/ada-tests/sptests/Makefile.am index b6377f211c..7edeb6fa4e 100644 --- a/c/src/ada-tests/sptests/Makefile.am +++ b/c/src/ada-tests/sptests/Makefile.am @@ -1,28 +1,28 @@ -SUBDIRS = -SUBDIRS += sp01 -SUBDIRS += sp02 -SUBDIRS += sp03 -SUBDIRS += sp04 -SUBDIRS += sp05 -SUBDIRS += sp06 -SUBDIRS += sp07 -SUBDIRS += sp08 -SUBDIRS += sp09 -SUBDIRS += sp11 -SUBDIRS += sp12 -SUBDIRS += sp13 -SUBDIRS += sp14 -SUBDIRS += sp15 -SUBDIRS += sp16 -SUBDIRS += sp17 -SUBDIRS += sp19 -SUBDIRS += sp20 -SUBDIRS += sp22 -SUBDIRS += sp23 -SUBDIRS += sp24 -SUBDIRS += sp25 -SUBDIRS += spname01 -SUBDIRS += spatcb01 +_SUBDIRS = +_SUBDIRS += sp01 +_SUBDIRS += sp02 +_SUBDIRS += sp03 +_SUBDIRS += sp04 +_SUBDIRS += sp05 +_SUBDIRS += sp06 +_SUBDIRS += sp07 +_SUBDIRS += sp08 +_SUBDIRS += sp09 +_SUBDIRS += sp11 +_SUBDIRS += sp12 +_SUBDIRS += sp13 +_SUBDIRS += sp14 +_SUBDIRS += sp15 +_SUBDIRS += sp16 +_SUBDIRS += sp17 +_SUBDIRS += sp19 +_SUBDIRS += sp20 +_SUBDIRS += sp22 +_SUBDIRS += sp23 +_SUBDIRS += sp24 +_SUBDIRS += sp25 +_SUBDIRS += spname01 +_SUBDIRS += spatcb01 include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am diff --git a/c/src/ada-tests/tmtests/Makefile.am b/c/src/ada-tests/tmtests/Makefile.am index 35a12493b2..64b5f6fe48 100644 --- a/c/src/ada-tests/tmtests/Makefile.am +++ b/c/src/ada-tests/tmtests/Makefile.am @@ -1,33 +1,33 @@ -SUBDIRS = -SUBDIRS += tm01 -SUBDIRS += tm02 -SUBDIRS += tm03 -SUBDIRS += tm04 -SUBDIRS += tm05 -SUBDIRS += tm06 -SUBDIRS += tm07 -SUBDIRS += tm08 -SUBDIRS += tm09 -SUBDIRS += tm10 -SUBDIRS += tm11 -SUBDIRS += tm12 -SUBDIRS += tm13 -SUBDIRS += tm14 -SUBDIRS += tm15 -SUBDIRS += tm16 -SUBDIRS += tm17 -SUBDIRS += tm18 -SUBDIRS += tm19 -SUBDIRS += tm20 -SUBDIRS += tm21 -SUBDIRS += tm22 -SUBDIRS += tm23 -SUBDIRS += tm24 -SUBDIRS += tm25 -SUBDIRS += tm28 -SUBDIRS += tm29 -SUBDIRS += tmck -SUBDIRS += tmoverhd +_SUBDIRS = +_SUBDIRS += tm01 +_SUBDIRS += tm02 +_SUBDIRS += tm03 +_SUBDIRS += tm04 +_SUBDIRS += tm05 +_SUBDIRS += tm06 +_SUBDIRS += tm07 +_SUBDIRS += tm08 +_SUBDIRS += tm09 +_SUBDIRS += tm10 +_SUBDIRS += tm11 +_SUBDIRS += tm12 +_SUBDIRS += tm13 +_SUBDIRS += tm14 +_SUBDIRS += tm15 +_SUBDIRS += tm16 +_SUBDIRS += tm17 +_SUBDIRS += tm18 +_SUBDIRS += tm19 +_SUBDIRS += tm20 +_SUBDIRS += tm21 +_SUBDIRS += tm22 +_SUBDIRS += tm23 +_SUBDIRS += tm24 +_SUBDIRS += tm25 +_SUBDIRS += tm28 +_SUBDIRS += tm29 +_SUBDIRS += tmck +_SUBDIRS += tmoverhd include $(top_srcdir)/../../../testsuites/automake/subdirs.am include $(top_srcdir)/../../../testsuites/automake/local.am -- cgit v1.2.3