From 564dcf4213507906c21e698cd89d510d73bc7f91 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 11 Nov 2005 14:41:53 +0000
Subject: Rework.

---
 testsuites/mptests/mp14/node1/Makefile.am | 42 ++++++-------------------------
 testsuites/mptests/mp14/node2/Makefile.am | 42 ++++++-------------------------
 2 files changed, 16 insertions(+), 68 deletions(-)

(limited to 'testsuites/mptests/mp14')

diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 010eac32a0..403683229d 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -10,54 +10,28 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-DOCS = mp14-node1.doc mp14-node1.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = mp14-node1.scn
+docdir = $(testsdir)
+dist_doc_DATA = mp14-node1.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/mp14-node1.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/mptests/node1/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
-	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
-
-$(project_bspdir)/tests/screens/mptests/node1/mp14-node1.scn: mp14-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/mp14-node1.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp14-node1.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
 
-if HAS_MP
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-else
-all-local:
-endif
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index baed5dc304..373291ab29 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -10,54 +10,28 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-DOCS = mp14-node2.doc mp14-node2.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = mp14-node2.scn
+docdir = $(testsdir)
+dist_doc_DATA = mp14-node2.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/mp14-node2.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/mptests/node2/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
-	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
-
-$(project_bspdir)/tests/screens/mptests/node2/mp14-node2.scn: mp14-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/mp14-node2.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp14-node2.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
 
-if HAS_MP
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-else
-all-local:
-endif
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
-- 
cgit v1.2.3