Patch rtems-rc-19991117-7.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

to convert the sample tests to automake.

11 files changed, 464 insertions, 9 deletions

diff --git a/testsuites/samples/Makefile.am b/testsuites/samples/Makefile.am
index b04c376dd6..e8c84121ac 100644
--- a/testsuites/samples/Makefile.am
+++ b/testsuites/samples/Makefile.am
@@ -5,14 +5,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
-
-PREINSTALLDIRS = $(project_bspdir)/samples $(project_bspdir)/tests
-$(PREINSTALLDIRS):
-	@$(mkinstalldirs) $@
-
-all-local: $(PREINSTALLDIRS)
-
 CPLUSPLUS_TESTS = cdtest
 
 ## base_mp is a sample multiprocessing test
@@ -20,8 +12,13 @@ MP_TESTS = base_mp
 
 FP_TESTS = paranoia
 
-SUBDIRS = . hello ticker base_sp unlimited minimum $(MP_TESTS) \
+SUBDIRS = hello ticker base_sp unlimited minimum $(MP_TESTS) \
     $(CPLUSPLUS_TESTS) $(FP_TESTS)
 
+AUTOMAKE_FILES = \
+sample.am
+
+EXTRA_DIST = $(AUTOMAKE_FILES)
+
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/base_mp/Makefile.am b/testsuites/samples/base_mp/Makefile.am
new file mode 100644
index 0000000000..932e671355
--- /dev/null
+++ b/testsuites/samples/base_mp/Makefile.am
@@ -0,0 +1,13 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SUBDIRS = node1 node2
+
+EXTRA_DIST = apptask.c init.c system.h
+
+include $(top_srcdir)/../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
new file mode 100644
index 0000000000..3dcfaf1c13
--- /dev/null
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -0,0 +1,59 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+VPATH = @srcdir@:@srcdir@/..
+
+NODE = 1
+SAMPLE = base_mp-node$(NODE)
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = io mp
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c apptask.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=base_mp.%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+if HAS_MP
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+
+#
+# Add your list of files to delete here.  The config files
+#  already know how to delete some stuff, so you may want
+#  to just run 'make clean' first to see what gets missed.
+#  'make clobber' already includes 'make clean'
+#
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+all-local: $(ARCH) $(TMPINSTALL_FILES)
+else
+all-local:
+endif
+
+EXTRA_DIST = $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
new file mode 100644
index 0000000000..8c9ca81f62
--- /dev/null
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -0,0 +1,59 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+VPATH = @srcdir@:@srcdir@/..
+
+NODE = 2
+SAMPLE = base_mp-node$(NODE)
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = io mp
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c apptask.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=base_mp.%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+if HAS_MP
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+
+#
+# Add your list of files to delete here.  The config files
+#  already know how to delete some stuff, so you may want
+#  to just run 'make clean' first to see what gets missed.
+#  'make clobber' already includes 'make clean'
+#
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+all-local: $(ARCH) $(TMPINSTALL_FILES)
+else
+all-local:
+endif
+
+EXTRA_DIST = $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
new file mode 100644
index 0000000000..488642e8d9
--- /dev/null
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -0,0 +1,43 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = base_sp
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = io
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c apptask.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+noinst_HEADERS = $(H_FILES)
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+EXTRA_DIST = $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
new file mode 100644
index 0000000000..63df0ec728
--- /dev/null
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -0,0 +1,55 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = cdtest
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = all
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+# C++ source names, if any, go here -- minus the .cc
+CC_FILES = main.cc
+CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o)
+
+H_FILES = system.h
+noinst_HEADERS = $(H_FILES)
+
+DOCTYPES = scn
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES)
+OBJS = $(C_O_FILES) $(CC_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(SAMPLE).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+if HAS_CXX
+LD_LIBS += $(CPLUS_LD_LIBS)
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+else
+all-local:
+endif
+
+EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
new file mode 100644
index 0000000000..9f78e2df38
--- /dev/null
+++ b/testsuites/samples/hello/Makefile.am
@@ -0,0 +1,45 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = hello
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = io
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+noinst_HEADERS = $(H_FILES)
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(SAMPLE).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+EXTRA_DIST += $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
new file mode 100644
index 0000000000..96a9bd4901
--- /dev/null
+++ b/testsuites/samples/minimum/Makefile.am
@@ -0,0 +1,43 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = minimum
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = all
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(SAMPLE).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+	# This test should not be executed
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+EXTRA_DIST = $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
new file mode 100644
index 0000000000..6d828ad594
--- /dev/null
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -0,0 +1,51 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = paranoia
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = all
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c paranoia.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+noinst_HEADERS = $(H_FILES)
+
+DOCTYPES = doc
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(SAMPLE).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+#  -DCYGNUS   turns on more verbose msgs
+#
+
+AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
+
+LD_LIBS += -lm
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+EXTRA_DIST = $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
new file mode 100644
index 0000000000..7af7c81524
--- /dev/null
+++ b/testsuites/samples/ticker/Makefile.am
@@ -0,0 +1,45 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = ticker
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = io
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c tasks.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+noinst_HEADERS = $(H_FILES)
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(SAMPLE).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+EXTRA_DIST += $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
new file mode 100644
index 0000000000..aaa9bb0b2e
--- /dev/null
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -0,0 +1,45 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+SAMPLE = unlimited
+PGM = ${ARCH}/$(SAMPLE).exe
+
+MANAGERS = io event
+
+# C source names, if any, go here -- minus the .c
+C_FILES = init.c test1.c test2.c test3.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = system.h
+noinst_HEADERS = $(H_FILES)
+
+DOCTYPES = doc scn
+DOCS = $(DOCTYPES:%=$(SAMPLE).%)
+
+SRCS = $(DOCS) $(C_FILES) $(H_FILES)
+OBJS = $(C_O_FILES)
+
+PRINT_SRCS = $(DOCS)
+
+PGM = ${ARCH}/$(SAMPLE).exe
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/sample.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+all-local: ${ARCH} $(TMPINSTALL_FILES)
+
+${PGM}: $(OBJS) $(LINK_FILES)
+	$(make-exe)
+
+EXTRA_DIST = $(C_FILES) $(DOCS)
+
+include $(top_srcdir)/../../../../automake/local.am