summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-09-13 17:34:10 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-09-13 17:34:10 +0000
commitd814e2c564eeefd958a40b66e11ccd555f2f53b6 (patch)
tree3dad18e7b0b7f81a814bbd5ce239f345c9c6cec8 /c
parent2002-09-13 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-d814e2c564eeefd958a40b66e11ccd555f2f53b6.tar.bz2
2002-09-13 Joel Sherrill <joel@OARcorp.com>
* samples/base_mp/node1/Makefile.am, samples/base_mp/node2/Makefile.am: Now appear to mostly compile.
Diffstat (limited to 'c')
-rw-r--r--c/src/ada-tests/ChangeLog5
-rw-r--r--c/src/ada-tests/samples/base_mp/node1/Makefile.am7
-rw-r--r--c/src/ada-tests/samples/base_mp/node2/Makefile.am7
3 files changed, 17 insertions, 2 deletions
diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index c042711122..1963854913 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,5 +1,10 @@
2002-09-13 Joel Sherrill <joel@OARcorp.com>
+ * samples/base_mp/node1/Makefile.am, samples/base_mp/node2/Makefile.am:
+ Now appear to mostly compile.
+
+2002-09-13 Joel Sherrill <joel@OARcorp.com>
+
* samples/hello/Makefile.am: Make sure init.c is compiled and
included. This test now runs.
diff --git a/c/src/ada-tests/samples/base_mp/node1/Makefile.am b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
index 77c9477074..6687d4cc5f 100644
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -1,5 +1,7 @@
## $Id$
+NODE=1
+
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
@@ -7,9 +9,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node1$(EXEEXT): ../mptest.adb
+node1$(EXEEXT): ../mptest.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
+init.o: ../../../support/init.c
+ $(COMPILE.c) -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. -c $<
+
if EXPADA
noinst_PROGRAMS = node1
endif
diff --git a/c/src/ada-tests/samples/base_mp/node2/Makefile.am b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
index d685165ae8..aa818980d6 100644
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -1,5 +1,7 @@
## $Id$
+NODE=2
+
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
@@ -7,9 +9,12 @@ include $(top_srcdir)/ada.am
AM_ADAFLAGS += -I$(srcdir)/..
-node2$(EXEEXT): ../mptest.adb
+node2$(EXEEXT): ../mptest.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
+init.o: ../../../support/init.c
+ $(COMPILE.c) -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. -c $<
+
if EXPADA
noinst_PROGRAMS = node2
endif