[rtems commit] ada/samples: Avoid build system defined defines

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Nov  6 19:13:30 2019 +0100

ada/samples: Avoid build system defined defines

Update #3818.

---

 testsuites/ada/samples/base_mp/node1/Makefile.am | 6 ++----
 testsuites/ada/samples/base_mp/node1/init.c      | 2 ++
 testsuites/ada/samples/base_mp/node2/Makefile.am | 6 ++----
 testsuites/ada/samples/base_mp/node2/init.c      | 2 ++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testsuites/ada/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index 4916854..26770f4 100644
--- a/testsuites/ada/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -4,18 +4,16 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
+AM_CPPFLAGS += -I$(srcdir)/..
 
 if EXPADA
 noinst_PROGRAMS = ada_base_mp_node1
-ada_base_mp_node1_SOURCES = mptest-per_node_configuration.adb
+ada_base_mp_node1_SOURCES = init.c mptest-per_node_configuration.adb
 endif
 
 ada_base_mp_node1$(EXEEXT): ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.o: ../../../support/init.c
-	$(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
-
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node1.scn
 
diff --git a/testsuites/ada/samples/base_mp/node1/init.c b/testsuites/ada/samples/base_mp/node1/init.c
new file mode 100644
index 0000000..073c033
--- /dev/null
+++ b/testsuites/ada/samples/base_mp/node1/init.c
@@ -0,0 +1,2 @@
+#define CONFIGURE_MP_NODE_NUMBER 1
+#include "../../../support/init.c"
diff --git a/testsuites/ada/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index 277a394..0129427 100644
--- a/testsuites/ada/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -4,18 +4,16 @@ include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
+AM_CPPFLAGS += -I$(srcdir)/..
 
 if EXPADA
 noinst_PROGRAMS = ada_base_mp_node2
-ada_base_mp_node2_SOURCES = mptest-per_node_configuration.adb
+ada_base_mp_node2_SOURCES = init.c mptest-per_node_configuration.adb
 endif
 
 ada_base_mp_node2$(EXEEXT): ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.o: ../../../support/init.c
-	$(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
-
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node2.scn
 
diff --git a/testsuites/ada/samples/base_mp/node2/init.c b/testsuites/ada/samples/base_mp/node2/init.c
new file mode 100644
index 0000000..ea6db06
--- /dev/null
+++ b/testsuites/ada/samples/base_mp/node2/init.c
@@ -0,0 +1,2 @@
+#define CONFIGURE_MP_NODE_NUMBER 2
+#include "../../../support/init.c"