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

to convert the sample tests to automake.

2 files changed, 59 insertions, 75 deletions

diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am
new file mode 100644
index 0000000000..3dcfaf1c13
--- /dev/null
+++ b/c/src/tests/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/c/src/tests/samples/base_mp/node1/Makefile.in b/c/src/tests/samples/base_mp/node1/Makefile.in
deleted file mode 100644
index 9477d76b71..0000000000
--- a/c/src/tests/samples/base_mp/node1/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = base_mp/node1
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@:@srcdir@/..
-
-NODE = 1
-SAMPLE = base_mp
-PGM = ${ARCH}/$(SAMPLE)-node$(NODE).exe
-
-MANAGERS = io mp
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = init apptask
-C_FILES = @HAS_MP_TRUE@$(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES = system.h
-
-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
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-PACKHEX = @PACKHEX@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES += -DNODE_NUMBER=$(NODE)
-CPPFLAGS += -I.
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# 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'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-#HACK: AM_CONDITIONAL
-all: @HAS_MP_TRUE@${ARCH} $(SRCS) $(PGM)
-@HAS_MP_TRUE@	@$(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/tests
-@HAS_MP_TRUE@	@$(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/samples
-
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status