2002-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* mptests/Makefile.am: New. * mptests/mp01/Makefile.am: New. * mptests/mp01/node1/Makefile.am: New. * mptests/mp01/node2/Makefile.am: New. * samples/base_mp/Makefile.am: Comment out building mptest$(EXEEXT). * samples/base_mp/node1/Makefile.am: New. * samples/base_mp/node2/Makefile.am: New. * configure.ac: Add mptests/mp01. Add samples/base_mp.
2002-09-02 05:08:57 +00:00
parent 5432fc4abb
commit 0c7ef52b60
9 changed files with 157 additions and 15 deletions
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* mptests/Makefile.am: New.
+	* mptests/mp01/Makefile.am: New.
+	* mptests/mp01/node1/Makefile.am: New.
+	* mptests/mp01/node2/Makefile.am: New.
+	* samples/base_mp/Makefile.am: Comment out building mptest$(EXEEXT).
+	* samples/base_mp/node1/Makefile.am: New.
+	* samples/base_mp/node2/Makefile.am: New.
+	* configure.ac: Add mptests/mp01. Add samples/base_mp.
+
 2002-08-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

 	* tmtests/tm20/Makefile.am: Remove EXPADA.
--- a/c/src/ada-tests/configure.ac
+++ b/c/src/ada-tests/configure.ac
@@ -48,6 +48,8 @@ samples/hello/Makefile
 samples/ticker/Makefile
 samples/base_sp/Makefile
 samples/base_mp/Makefile
+samples/base_mp/node1/Makefile
+samples/base_mp/node2/Makefile
 ])

 AC_CONFIG_FILES([
@@ -111,10 +113,24 @@ tmtests/tmck/Makefile
 tmtests/tmoverhd/Makefile
 ])

-#AC_CONFIG_FILES([
-#mptests/Makefile
-#mptests/mp01/Makefile
+AC_CONFIG_FILES([
+mptests/Makefile
+mptests/mp01/Makefile
+mptests/mp01/node1/Makefile
+mptests/mp01/node2/Makefile
+])
 #mptests/mp02/Makefile
-#])
+#mptests/mp03/Makefile
+#mptests/mp04/Makefile
+#mptests/mp05/Makefile
+#mptests/mp06/Makefile
+#mptests/mp07/Makefile
+#mptests/mp08/Makefile
+#mptests/mp09/Makefile
+#mptests/mp10/Makefile
+#mptests/mp11/Makefile
+#mptests/mp12/Makefile
+#mptests/mp13/Makefile
+#mptests/mp14/Makefile

 AC_OUTPUT
--- a/c/src/ada-tests/mptests/Makefile.am
+++ b/c/src/ada-tests/mptests/Makefile.am
@@ -0,0 +1,20 @@
+## $Id$
+
+SUBDIRS =
+SUBDIRS += mp01
+#SUBDIRS += mp02
+#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)/../../../automake/subdirs.am
+include $(top_srcdir)/../../../automake/local.am
--- a/c/src/ada-tests/mptests/mp01/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/Makefile.am
@@ -0,0 +1,9 @@
+## $Id$
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/subdirs.am
+
+SUBDIRS = node1 node2
+
+include $(top_srcdir)/../../../automake/local.am
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -0,0 +1,21 @@
+## $Id$
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+
+include $(top_srcdir)/ada.am
+
+AM_ADAFLAGS += -I$(srcdir)/..
+
+node1$(EXEEXT): mptest-per_node_configuration.adb
+	$(GNATCOMPILE) -margs -a $< -o $@
+
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
+EXTRA_DIST = base_mp.scn
+
+include $(top_srcdir)/../../../automake/local.am
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -0,0 +1,21 @@
+## $Id$
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+
+include $(top_srcdir)/ada.am
+
+AM_ADAFLAGS += -I$(srcdir)/..
+
+node2$(EXEEXT): mptest-per_node_configuration.adb
+	$(GNATCOMPILE) -margs -a $< -o $@
+
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
+EXTRA_DIST = base_mp.scn
+
+include $(top_srcdir)/../../../automake/local.am
--- a/c/src/ada-tests/samples/base_mp/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/Makefile.am
@@ -2,22 +2,24 @@

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/subdirs.am

-include $(top_srcdir)/ada.am
+SUBDIRS = node1 node2
+#include $(top_srcdir)/ada.am

-mptest$(EXEEXT): mptest.adb
-	$(GNATCOMPILE) -margs -a $< -o $@
+#mptest$(EXEEXT): mptest.adb
+#	$(GNATCOMPILE) -margs -a $< -o $@

-if EXPADA
-noinst_PROGRAMS = mptest
-endif
+#if EXPADA
+#noinst_PROGRAMS = mptest
+#endif

-mptest_SOURCES = mptest.adb mptest.ads
+#mptest_SOURCES = mptest.adb mptest.ads

-EXTRA_DIST = node1/base_mp.scn
-EXTRA_DIST += node1/mptest-per_node_configuration.adb
+#EXTRA_DIST = node1/base_mp.scn
+#EXTRA_DIST += node1/mptest-per_node_configuration.adb

-EXTRA_DIST += node2/base_mp.scn
-EXTRA_DIST += node2/mptest-per_node_configuration.adb
+#EXTRA_DIST += node2/base_mp.scn
+#EXTRA_DIST += node2/mptest-per_node_configuration.adb

 include $(top_srcdir)/../../../automake/local.am
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -0,0 +1,21 @@
+## $Id$
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+
+include $(top_srcdir)/ada.am
+
+AM_ADAFLAGS += -I$(srcdir)/..
+
+node1$(EXEEXT): mptest-per_node_configuration.adb
+	$(GNATCOMPILE) -margs -a $< -o $@
+
+if EXPADA
+noinst_PROGRAMS = node1
+endif
+
+node1_SOURCES = mptest-per_node_configuration.adb
+
+EXTRA_DIST = base_mp.scn
+
+include $(top_srcdir)/../../../automake/local.am
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -0,0 +1,21 @@
+## $Id$
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+
+include $(top_srcdir)/ada.am
+
+AM_ADAFLAGS += -I$(srcdir)/..
+
+node2$(EXEEXT): mptest-per_node_configuration.adb
+	$(GNATCOMPILE) -margs -a $< -o $@
+
+if EXPADA
+noinst_PROGRAMS = node2
+endif
+
+node2_SOURCES = mptest-per_node_configuration.adb
+
+EXTRA_DIST = base_mp.scn
+
+include $(top_srcdir)/../../../automake/local.am