From 0acb58f7643dd11836d4ce075570ea40c533d64c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 7 Nov 2005 07:36:35 +0000 Subject: Partial conversion to automake. --- testsuites/libtests/cpuuse/Makefile.am | 15 ++++++--------- testsuites/libtests/malloctest/Makefile.am | 15 ++++++--------- testsuites/libtests/monitor/Makefile.am | 15 ++++++--------- testsuites/libtests/putenvtest/Makefile.am | 15 ++++++--------- testsuites/libtests/rtems++/Makefile.am | 15 +++++++-------- testsuites/libtests/rtmonuse/Makefile.am | 15 ++++++--------- testsuites/libtests/stackchk/Makefile.am | 15 ++++++--------- testsuites/libtests/termios/Makefile.am | 15 ++++++--------- 8 files changed, 49 insertions(+), 71 deletions(-) diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am index 3f07f00d2c..64201f6698 100644 --- a/testsuites/libtests/cpuuse/Makefile.am +++ b/testsuites/libtests/cpuuse/Makefile.am @@ -6,24 +6,21 @@ TEST = cpuuse MANAGERS = io rate_monotonic -C_FILES = init.c task1.c task2.c task3.c tswitch.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am index 3efcfefca4..e028ef3ef1 100644 --- a/testsuites/libtests/malloctest/Makefile.am +++ b/testsuites/libtests/malloctest/Makefile.am @@ -6,24 +6,21 @@ TEST = malloctest MANAGERS = io -C_FILES = init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c task1.c system.h DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am index ede5a50779..8deee944d6 100644 --- a/testsuites/libtests/monitor/Makefile.am +++ b/testsuites/libtests/monitor/Makefile.am @@ -7,24 +7,21 @@ TEST = monitor MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \ ext -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c system.h DOCTYPES = scn DOCS = #$(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -37,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am index e14d20dac2..32cba655ee 100644 --- a/testsuites/libtests/putenvtest/Makefile.am +++ b/testsuites/libtests/putenvtest/Makefile.am @@ -6,24 +6,21 @@ TEST = putenvtest MANAGERS = io -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am index be47605e52..fc7617504e 100644 --- a/testsuites/libtests/rtems++/Makefile.am +++ b/testsuites/libtests/rtems++/Makefile.am @@ -6,23 +6,22 @@ TEST = rtems++ MANAGERS = event io msg sem signal timer rate_monotonic -CC_FILES = Init.cc Task1.cc Task2.cc Task3.cc -OBJS = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) - -H_FILES = System.h -noinst_HEADERS = $(H_FILES) +if HAS_CXX +noinst_LIBRARIES = lib.a +lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h +endif DOCTYPES = scn doc DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) +SRCS = $(DOCS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -42,7 +41,7 @@ else all-local: endif -EXTRA_DIST = $(CC_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am index fcd3fcf235..f1680f8224 100644 --- a/testsuites/libtests/rtmonuse/Makefile.am +++ b/testsuites/libtests/rtmonuse/Makefile.am @@ -6,24 +6,21 @@ TEST = rtmonuse MANAGERS = io rate_monotonic -C_FILES = init.c getall.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c getall.c task1.c system.h DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am index 8e70e5100a..49f82a9520 100644 --- a/testsuites/libtests/stackchk/Makefile.am +++ b/testsuites/libtests/stackchk/Makefile.am @@ -6,24 +6,21 @@ TEST = stackchk MANAGERS = io -C_FILES = blow.c init.c task1.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = blow.c init.c task1.c system.h DOCTYPES = scn DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am index a7950f4e0b..6723b45ec7 100644 --- a/testsuites/libtests/termios/Makefile.am +++ b/testsuites/libtests/termios/Makefile.am @@ -6,24 +6,21 @@ TEST = termios MANAGERS = io -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -H_FILES = -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c DOCTYPES = DOCS = $(DOCTYPES:%=$(TEST).%) -SRCS = $(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) -OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) PGM = ${ARCH}/$(TEST).exe include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/amcompile.am include $(top_srcdir)/../automake/leaf.am include $(top_srcdir)/libtests.am @@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) -- cgit v1.2.3