From 564dcf4213507906c21e698cd89d510d73bc7f91 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 11 Nov 2005 14:41:53 +0000 Subject: Rework. --- testsuites/mptests/mp01/node1/Makefile.am | 47 ++++++---------------------- testsuites/mptests/mp01/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp02/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp02/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp03/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp03/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp04/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp04/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp05/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp05/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp06/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp06/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp07/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp07/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp08/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp08/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp09/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp09/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp10/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp10/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp11/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp11/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp12/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp12/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp13/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp13/node2/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp14/node1/Makefile.am | 42 +++++-------------------- testsuites/mptests/mp14/node2/Makefile.am | 42 +++++-------------------- testsuites/samples/base_mp/node1/Makefile.am | 34 +++++--------------- testsuites/samples/base_mp/node2/Makefile.am | 34 +++++--------------- 30 files changed, 240 insertions(+), 1009 deletions(-) diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am index 3f2a661189..4983d73d0d 100644 --- a/testsuites/mptests/mp01/node1/Makefile.am +++ b/testsuites/mptests/mp01/node1/Makefile.am @@ -2,60 +2,33 @@ ## $Id$ ## -PGM = $(ARCH)/mp01-node1.exe - MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp01-node1.doc mp01-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp01-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp01-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/mp01-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/mp01-node1.scn: mp01-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp01-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp01-node1.scn - -$(PGM): ${ARCH}/$(dirstamp) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. - -if HAS_MP - - AM_CPPFLAGS += -I$(top_srcdir)/../support/include -${PGM}: $(OBJS) $(LINK_FILES) - $(make-exe) +PGM = $(ARCH)/mp01-node1.exe -all-local: $(TMPINSTALL_FILES) -else -all-local: -endif +tests_SCRIPTS = $(PGM) -EXTRA_DIST = $(DOCS) +$(PGM): ${ARCH}/$(dirstamp) -CLEANFILES = $(TMPINSTALL_FILES) +$(PGM): $(OBJS) $(LINK_FILES) + $(make-exe) include $(top_srcdir)/../automake/local.am diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am index 85d97e9f45..6a7b397977 100644 --- a/testsuites/mptests/mp01/node2/Makefile.am +++ b/testsuites/mptests/mp01/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp01-node2.doc mp01-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp01-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp01-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/mp01-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/mp01-node2.scn: mp01-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp01-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp01-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am index 484d5ecd06..f01b4911fe 100644 --- a/testsuites/mptests/mp02/node1/Makefile.am +++ b/testsuites/mptests/mp02/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp02-node1.doc mp02-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp02-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp02-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/mp02-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/mp02-node1.scn: mp02-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp02-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp02-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am index 8eef528192..a9fa753d53 100644 --- a/testsuites/mptests/mp02/node2/Makefile.am +++ b/testsuites/mptests/mp02/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp02-node2.doc mp02-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp02-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp02-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/mp02-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/mp02-node2.scn: mp02-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp02-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp02-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am index afe6a70aa7..eecb928ab5 100644 --- a/testsuites/mptests/mp03/node1/Makefile.am +++ b/testsuites/mptests/mp03/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp timer event noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h -DOCS = mp03-node1.doc mp03-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp03-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp03-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/mp03-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/mp03-node1.scn: mp03-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp03-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp03-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am index 40a5758934..ad95377715 100644 --- a/testsuites/mptests/mp03/node2/Makefile.am +++ b/testsuites/mptests/mp03/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp timer event noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h -DOCS = mp03-node2.doc mp03-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp03-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp03-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/mp03-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/mp03-node2.scn: mp03-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp03-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp03-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am index 29a2284fcb..a55e18e7e7 100644 --- a/testsuites/mptests/mp04/node1/Makefile.am +++ b/testsuites/mptests/mp04/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp04-node1.doc mp04-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp04-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp04-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/mp04-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/mp04-node1.scn: mp04-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp04-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp04-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am index faccce9e66..ed5e92a05a 100644 --- a/testsuites/mptests/mp04/node2/Makefile.am +++ b/testsuites/mptests/mp04/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp04-node2.doc mp04-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp04-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp04-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/mp04-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/mp04-node2.scn: mp04-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp04-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp04-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am index 0a1268a161..1c62a86fb8 100644 --- a/testsuites/mptests/mp05/node1/Makefile.am +++ b/testsuites/mptests/mp05/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp signal timer noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h -DOCS = mp05-node1.doc mp05-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp05-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp05-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/mp05-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/mp05-node1.scn: mp05-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp05-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp05-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am index 97976aeca8..79cf60192a 100644 --- a/testsuites/mptests/mp05/node2/Makefile.am +++ b/testsuites/mptests/mp05/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp signal timer noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h -DOCS = mp05-node2.doc mp05-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp05-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp05-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/mp05-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/mp05-node2.scn: mp05-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp05-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp05-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am index e9b877b798..445a51c32f 100644 --- a/testsuites/mptests/mp06/node1/Makefile.am +++ b/testsuites/mptests/mp06/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp event timer noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp06-node1.doc mp06-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp06-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp06-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/mp06-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/mp06-node1.scn: mp06-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp06-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp06-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am index 9d1488b9a3..84552d0085 100644 --- a/testsuites/mptests/mp06/node2/Makefile.am +++ b/testsuites/mptests/mp06/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp event timer noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp06-node2.doc mp06-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp06-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp06-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/mp06-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/mp06-node2.scn: mp06-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp06-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp06-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am index 9c691cb075..d6da75335f 100644 --- a/testsuites/mptests/mp07/node1/Makefile.am +++ b/testsuites/mptests/mp07/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp event timer noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp07-node1.doc mp07-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp07-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp07-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/mp07-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/mp07-node1.scn: mp07-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp07-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp07-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am index 5198142adc..167f51a937 100644 --- a/testsuites/mptests/mp07/node2/Makefile.am +++ b/testsuites/mptests/mp07/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp event timer noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp07-node2.doc mp07-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp07-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp07-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/mp07-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/mp07-node2.scn: mp07-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp07-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp07-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am index 146acb719b..f5fc6a953f 100644 --- a/testsuites/mptests/mp08/node1/Makefile.am +++ b/testsuites/mptests/mp08/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp08-node1.doc mp08-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp08-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp08-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/mp08-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/mp08-node1.scn: mp08-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp08-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp08-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am index 53b43ffbfa..a759a32265 100644 --- a/testsuites/mptests/mp08/node2/Makefile.am +++ b/testsuites/mptests/mp08/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../system.h -DOCS = mp08-node2.doc mp08-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp08-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp08-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/mp08-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/mp08-node2.scn: mp08-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp08-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp08-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am index c54387ebfc..3bed29255c 100644 --- a/testsuites/mptests/mp09/node1/Makefile.am +++ b/testsuites/mptests/mp09/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h -DOCS = mp09-node1.doc mp09-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp09-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp09-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/mp09-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/mp09-node1.scn: mp09-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp09-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp09-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am index 0ef94ce075..4988f8299e 100644 --- a/testsuites/mptests/mp09/node2/Makefile.am +++ b/testsuites/mptests/mp09/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h -DOCS = mp09-node2.doc mp09-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp09-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp09-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/mp09-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/mp09-node2.scn: mp09-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp09-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp09-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am index b13784eaba..389b46bb76 100644 --- a/testsuites/mptests/mp10/node1/Makefile.am +++ b/testsuites/mptests/mp10/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h -DOCS = mp10-node1.doc mp10-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp10-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp10-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/mp10-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/mp10-node1.scn: mp10-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp10-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp10-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am index 78af331009..e07addd599 100644 --- a/testsuites/mptests/mp10/node2/Makefile.am +++ b/testsuites/mptests/mp10/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h -DOCS = mp10-node2.doc mp10-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp10-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp10-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/mp10-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/mp10-node2.scn: mp10-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp10-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp10-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am index 2d438e45d4..1799654cb1 100644 --- a/testsuites/mptests/mp11/node1/Makefile.am +++ b/testsuites/mptests/mp11/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message partition semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../system.h -DOCS = mp11-node1.doc mp11-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp11-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp11-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/mp11-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/mp11-node1.scn: mp11-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp11-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp11-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am index 1c847b4cfd..5bd9a42a74 100644 --- a/testsuites/mptests/mp11/node2/Makefile.am +++ b/testsuites/mptests/mp11/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message partition semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../system.h -DOCS = mp11-node2.doc mp11-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp11-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp11-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/mp11-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/mp11-node2.scn: mp11-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp11-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp11-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am index b8cc5b558d..c7ec6674d8 100644 --- a/testsuites/mptests/mp12/node1/Makefile.am +++ b/testsuites/mptests/mp12/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp partition noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../system.h -DOCS = mp12-node1.doc mp12-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp12-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp12-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/mp12-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/mp12-node1.scn: mp12-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp12-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp12-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am index ecd9628e41..fead43b668 100644 --- a/testsuites/mptests/mp12/node2/Makefile.am +++ b/testsuites/mptests/mp12/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp partition noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../system.h -DOCS = mp12-node2.doc mp12-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp12-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp12-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/mp12-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/mp12-node2.scn: mp12-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp12-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp12-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am index 45638441da..e13f4960ec 100644 --- a/testsuites/mptests/mp13/node1/Makefile.am +++ b/testsuites/mptests/mp13/node1/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h -DOCS = mp13-node1.doc mp13-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp13-node1.scn +docdir = $(testsdir) +dist_doc_DATA = mp13-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/mp13-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/mp13-node1.scn: mp13-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp13-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node1/mp13-node1.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. -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/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am index 3e400e3471..40158520e7 100644 --- a/testsuites/mptests/mp13/node2/Makefile.am +++ b/testsuites/mptests/mp13/node2/Makefile.am @@ -9,53 +9,27 @@ MANAGERS = io mp message semaphore noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h -DOCS = mp13-node2.doc mp13-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = mp13-node2.scn +docdir = $(testsdir) +dist_doc_DATA = mp13-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/mp13-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/mp13-node2.scn: mp13-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp) - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/mp13-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/tests/screens/mptests/node2/mp13-node2.scn - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. -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/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 diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am index f8fc40907e..589bb1828f 100644 --- a/testsuites/samples/base_mp/node1/Makefile.am +++ b/testsuites/samples/base_mp/node1/Makefile.am @@ -9,45 +9,25 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../apptask.c ../system.h -DOCS = base_mp-node1.doc base_mp-node1.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = base_mp-node1.scn +docdir = $(testsdir) +dist_doc_DATA = base_mp-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)/samples/$(dirstamp): - @$(mkdir_p) $(project_bspdir)/samples - @: > $(project_bspdir)/samples/$(dirstamp) -$(project_bspdir)/tests/$(dirstamp): - @$(mkdir_p) $(project_bspdir)/tests - @: > $(project_bspdir)/tests/$(dirstamp) - -$(project_bspdir)/samples/base_mp-node1.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp) - $(INSTALL_PROGRAM) $< $@ - -$(project_bspdir)/tests/base_mp-node1.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) - $(INSTALL_PROGRAM) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node1.exe -TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node1.exe - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=1 -I. +tests_SCRIPTS = $(PGM) -${PGM}: $(OBJS) $(LINK_FILES) +$(PGM): $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = $(DOCS) - -CLEANFILES = $(TMPINSTALL_FILES) - include $(top_srcdir)/../automake/local.am diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am index bf9f1720a6..6f1b23800e 100644 --- a/testsuites/samples/base_mp/node2/Makefile.am +++ b/testsuites/samples/base_mp/node2/Makefile.am @@ -9,45 +9,25 @@ MANAGERS = io mp noinst_LIBRARIES = lib.a lib_a_SOURCES = ../init.c ../apptask.c ../system.h -DOCS = base_mp-node2.doc base_mp-node2.scn +testsdir = $(libdir)/tests +scndir = $(testsdir) +dist_scn_DATA = base_mp-node2.scn +docdir = $(testsdir) +dist_doc_DATA = base_mp-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)/samples/$(dirstamp): - @$(mkdir_p) $(project_bspdir)/samples - @: > $(project_bspdir)/samples/$(dirstamp) -$(project_bspdir)/tests/$(dirstamp): - @$(mkdir_p) $(project_bspdir)/tests - @: > $(project_bspdir)/tests/$(dirstamp) - -$(project_bspdir)/samples/base_mp-node2.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp) - $(INSTALL_PROGRAM) $< $@ - -$(project_bspdir)/tests/base_mp-node2.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp) - $(INSTALL_PROGRAM) $< $@ - -TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node2.exe -TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node2.exe - $(PGM): ${ARCH}/$(dirstamp) AM_CPPFLAGS += -DNODE_NUMBER=2 -I. +tests_SCRIPTS = $(PGM) -${PGM}: $(OBJS) $(LINK_FILES) +$(PGM): $(OBJS) $(LINK_FILES) $(make-exe) -all-local: $(TMPINSTALL_FILES) - -EXTRA_DIST = $(DOCS) - -CLEANFILES = $(TMPINSTALL_FILES) - include $(top_srcdir)/../automake/local.am -- cgit v1.2.3