From c4ea5efc613cad9bfb0c56c250a2f26b69249688 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 24 Nov 1999 14:19:26 +0000 Subject: Patch rtems-rc-19991123-rc-0.diff from Ralf Corsepius which (among other things) converted the mptests to automake. --- c/src/tests/mptests/mp06/Makefile.am | 12 +++++ c/src/tests/mptests/mp06/Makefile.in | 25 --------- c/src/tests/mptests/mp06/node1/Makefile.am | 58 +++++++++++++++++++++ c/src/tests/mptests/mp06/node1/Makefile.in | 81 ------------------------------ c/src/tests/mptests/mp06/node2/Makefile.am | 58 +++++++++++++++++++++ c/src/tests/mptests/mp06/node2/Makefile.in | 81 ------------------------------ 6 files changed, 128 insertions(+), 187 deletions(-) create mode 100644 c/src/tests/mptests/mp06/Makefile.am delete mode 100644 c/src/tests/mptests/mp06/Makefile.in create mode 100644 c/src/tests/mptests/mp06/node1/Makefile.am delete mode 100644 c/src/tests/mptests/mp06/node1/Makefile.in create mode 100644 c/src/tests/mptests/mp06/node2/Makefile.am delete mode 100644 c/src/tests/mptests/mp06/node2/Makefile.in (limited to 'c/src/tests/mptests/mp06') diff --git a/c/src/tests/mptests/mp06/Makefile.am b/c/src/tests/mptests/mp06/Makefile.am new file mode 100644 index 0000000000..cdae39f815 --- /dev/null +++ b/c/src/tests/mptests/mp06/Makefile.am @@ -0,0 +1,12 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = node1 node2 + +EXTRA_DIST = system.h init.c task1.c + +include $(top_srcdir)/../../../../automake/subdirs.am +include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/tests/mptests/mp06/Makefile.in b/c/src/tests/mptests/mp06/Makefile.in deleted file mode 100644 index 7a4000577c..0000000000 --- a/c/src/tests/mptests/mp06/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = mp06 - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/directory.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -SUBDIRS = node1 node2 - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am new file mode 100644 index 0000000000..4086ae3e51 --- /dev/null +++ b/c/src/tests/mptests/mp06/node1/Makefile.am @@ -0,0 +1,58 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +VPATH = @srcdir@:@srcdir@/.. + +NODE = 1 +TEST = mp06 +PGM = ${ARCH}/$(TEST)-node$(NODE).exe + +MANAGERS = io mp event timer + +# C source names, if any, go here -- minus the .c +C_FILES = init.c task1.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +H_FILES = system.h + +DOCTYPES = doc scn +DOCS = $(DOCTYPES:%=$(TEST).%) + +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)/mptests.am + +if HAS_MP + +# +# (OPTIONAL) Add local stuff here using += +# + +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + +# +# 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/mptests/mp06/node1/Makefile.in b/c/src/tests/mptests/mp06/node1/Makefile.in deleted file mode 100644 index 7d485705a9..0000000000 --- a/c/src/tests/mptests/mp06/node1/Makefile.in +++ /dev/null @@ -1,81 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = mp06/node1 - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@:@srcdir@/.. - -NODE = 1 -TEST = mp06 -PGM = ${ARCH}/$(TEST)-node$(NODE).exe - -MANAGERS = io mp event timer - -# C source names, if any, go here -- minus the .c -C_PIECES = init task1 -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_FILES = system.h - -DOCTYPES = doc scn -DOCS = $(DOCTYPES:%=$(TEST).%) - -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@ -mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs - -INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE) - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (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 += - -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/tests - $(INSTALL_CHANGE) $(srcdir)/$(TEST).scn \ - $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn - -${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 diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am new file mode 100644 index 0000000000..b581f5071b --- /dev/null +++ b/c/src/tests/mptests/mp06/node2/Makefile.am @@ -0,0 +1,58 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +VPATH = @srcdir@:@srcdir@/.. + +NODE = 2 +TEST = mp06 +PGM = ${ARCH}/$(TEST)-node$(NODE).exe + +MANAGERS = io mp event timer + +# C source names, if any, go here -- minus the .c +C_FILES = init.c task1.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +H_FILES = system.h + +DOCTYPES = doc scn +DOCS = $(DOCTYPES:%=$(TEST).%) + +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)/mptests.am + +if HAS_MP + +# +# (OPTIONAL) Add local stuff here using += +# + +AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/.. + +# +# 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/mptests/mp06/node2/Makefile.in b/c/src/tests/mptests/mp06/node2/Makefile.in deleted file mode 100644 index 36e40c297c..0000000000 --- a/c/src/tests/mptests/mp06/node2/Makefile.in +++ /dev/null @@ -1,81 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = mp06/node2 - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@:@srcdir@/.. - -NODE = 2 -TEST = mp06 -PGM = ${ARCH}/$(TEST)-node$(NODE).exe - -MANAGERS = io mp event timer - -# C source names, if any, go here -- minus the .c -C_PIECES = init task1 -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -H_FILES = system.h - -DOCTYPES = doc scn -DOCS = $(DOCTYPES:%=$(TEST).%) - -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@ -mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs - -INSTALLDIRS = $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE) - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (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 += - -all: ${ARCH} $(SRCS) $(PGM) - $(INSTALL_VARIANT) -m 755 ${PGM} $(PROJECT_RELEASE)/tests - $(INSTALL_CHANGE) $(srcdir)/$(TEST).scn \ - $(PROJECT_RELEASE)/tests/screens/mptests/node$(NODE)/$(TEST).scn - -${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 -- cgit v1.2.3