summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-19 17:21:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-19 17:21:22 +0000
commit15c4b4c561b087069aeda59e120dbab1dc30db37 (patch)
treeb1493cba01922040f8103b00eefd0819b3242c8d /testsuites
parent929efa6b859d97be0e7cf9bb393006b32158ecd2 (diff)
downloadrtems-15c4b4c561b087069aeda59e120dbab1dc30db37.tar.bz2
2001-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* unlimited/Makefile.am: include leaf.am instead of leaf.cfg. * base_mp/node2/Makefile.am: include leaf.am instead of leaf.cfg. * base_mp/node1/Makefile.am: include leaf.am instead of leaf.cfg. * hello/Makefile.am: include leaf.am instead of leaf.cfg. * base_sp/Makefile.am: include leaf.am instead of leaf.cfg. * paranoia/Makefile.am: include leaf.am instead of leaf.cfg. * cdtest/Makefile.am: include leaf.am instead of leaf.cfg, use make-cxx-exe. * ticker/Makefile.am: include leaf.am instead of leaf.cfg. * minimum/Makefile.am: include leaf.am instead of leaf.cfg.
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/samples/ChangeLog13
-rw-r--r--testsuites/samples/base_mp/node1/Makefile.am2
-rw-r--r--testsuites/samples/base_mp/node2/Makefile.am2
-rw-r--r--testsuites/samples/base_sp/Makefile.am2
-rw-r--r--testsuites/samples/cdtest/Makefile.am4
-rw-r--r--testsuites/samples/hello/Makefile.am2
-rw-r--r--testsuites/samples/minimum/Makefile.am2
-rw-r--r--testsuites/samples/paranoia/Makefile.am2
-rw-r--r--testsuites/samples/ticker/Makefile.am2
-rw-r--r--testsuites/samples/unlimited/Makefile.am2
10 files changed, 23 insertions, 10 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog
index 2fcde4cf66..6c6a794f50 100644
--- a/testsuites/samples/ChangeLog
+++ b/testsuites/samples/ChangeLog
@@ -1,3 +1,16 @@
+2001-09-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * unlimited/Makefile.am: include leaf.am instead of leaf.cfg.
+ * base_mp/node2/Makefile.am: include leaf.am instead of leaf.cfg.
+ * base_mp/node1/Makefile.am: include leaf.am instead of leaf.cfg.
+ * hello/Makefile.am: include leaf.am instead of leaf.cfg.
+ * base_sp/Makefile.am: include leaf.am instead of leaf.cfg.
+ * paranoia/Makefile.am: include leaf.am instead of leaf.cfg.
+ * cdtest/Makefile.am: include leaf.am instead of leaf.cfg, use
+ make-cxx-exe.
+ * ticker/Makefile.am: include leaf.am instead of leaf.cfg.
+ * minimum/Makefile.am: include leaf.am instead of leaf.cfg.
+
2001-06-14 Joel Sherrill <joel@OARcorp.com>
* cdtest/system.h: Removed configure of POSIX mutexes since
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 17d6b9e005..85cf16f4e5 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -27,7 +27,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 5b258e19b1..3ba7935b60 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -27,7 +27,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 6ee0089a0c..5fa8708868 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index ec6902323c..51f1258f59 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -28,7 +28,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#
@@ -39,7 +39,7 @@ if HAS_CXX
LD_LIBS += $(CPLUS_LD_LIBS)
${PGM}: $(OBJS) $(LINK_FILES)
- $(make-exe)
+ $(make-cxx-exe)
all-local: ${ARCH} $(TMPINSTALL_FILES)
else
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 6f8550a396..7afd508c5e 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index 8aac91eb31..db0f560028 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index cf73a28100..feb0d47ee9 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 7707f86846..2eab38b813 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index ee1f11a3e7..31a5a182ce 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../automake/compile.am
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
include $(top_srcdir)/sample.am
#