From b98d0013c159ffbe06ad3eb619509d1170008fcd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 7 Nov 2005 07:30:36 +0000 Subject: Partial conversion to automake. --- testsuites/samples/base_mp/node1/Makefile.am | 12 ++++++------ testsuites/samples/base_mp/node2/Makefile.am | 12 ++++++------ testsuites/samples/base_sp/Makefile.am | 15 ++++++--------- testsuites/samples/cdtest/Makefile.am | 18 ++++++------------ testsuites/samples/fileio/Makefile.am | 15 ++++++--------- testsuites/samples/hello/Makefile.am | 15 ++++++--------- testsuites/samples/iostream/Makefile.am | 15 ++++++--------- testsuites/samples/loopback/Makefile.am | 12 ++++++------ testsuites/samples/minimum/Makefile.am | 12 ++++++------ testsuites/samples/paranoia/Makefile.am | 15 ++++++--------- testsuites/samples/pppd/Makefile.am | 13 ++++--------- testsuites/samples/ticker/Makefile.am | 15 ++++++--------- testsuites/samples/unlimited/Makefile.am | 15 ++++++--------- 13 files changed, 76 insertions(+), 108 deletions(-) diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am index d8f4101910..b8c2b79748 100644 --- a/testsuites/samples/base_mp/node1/Makefile.am +++ b/testsuites/samples/base_mp/node1/Makefile.am @@ -8,24 +8,24 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io mp -C_FILES = ../init.c ../apptask.c -C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = ../init.c ../apptask.c $(ARCH)/%.$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) ${COMPILE} -o $@ -c $< -H_FILES = system.h +lib_a_SOURCES += system.h DOCTYPES = doc scn DOCS = $(DOCTYPES:%=base_mp.%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am index 61b258eecd..93b78fed4d 100644 --- a/testsuites/samples/base_mp/node2/Makefile.am +++ b/testsuites/samples/base_mp/node2/Makefile.am @@ -8,24 +8,24 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io mp -C_FILES = ../init.c ../apptask.c -C_O_FILES = $(C_FILES:../%.c=${ARCH}/%.$(OBJEXT)) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = ../init.c ../apptask.c $(ARCH)/%.$(OBJEXT): ../%.c $(ARCH)/$(dirstamp) ${COMPILE} -o $@ -c $< -H_FILES = system.h +lib_a_SOURCES += system.h DOCTYPES = doc scn DOCS = $(DOCTYPES:%=base_mp.%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am index 9e08a65424..81fc8e35bb 100644 --- a/testsuites/samples/base_sp/Makefile.am +++ b/testsuites/samples/base_sp/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io -C_FILES = init.c apptask.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 apptask.c system.h DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -35,7 +32,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am index 30c597c720..6aff2dc713 100644 --- a/testsuites/samples/cdtest/Makefile.am +++ b/testsuites/samples/cdtest/Makefile.am @@ -7,25 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = all -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) - -CC_FILES = main.cc -CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c main.cc system.h DOCTYPES = scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(CC_FILES) $(H_FILES) -OBJS = $(C_O_FILES) $(CC_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -40,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = $(C_FILES) $(CC_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am index ed7464c3fd..7935c9fcd6 100644 --- a/testsuites/samples/fileio/Makefile.am +++ b/testsuites/samples/fileio/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io message semaphore -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 = doc DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -37,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) endif -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am index 18e67cb19a..81231ee08e 100644 --- a/testsuites/samples/hello/Makefile.am +++ b/testsuites/samples/hello/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io -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 = doc scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -35,7 +32,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am index 333b4b648e..2052ab4ea2 100644 --- a/testsuites/samples/iostream/Makefile.am +++ b/testsuites/samples/iostream/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io -CC_FILES = init.cc -CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)) - -H_FILES = system.h -noinst_HEADERS = $(H_FILES) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.cc system.h DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(CC_FILES) $(H_FILES) -OBJS = $(CC_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -35,7 +32,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-cxx-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am index 59459b20aa..392e476f74 100644 --- a/testsuites/samples/loopback/Makefile.am +++ b/testsuites/samples/loopback/Makefile.am @@ -7,19 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io event -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c DOCTYPES = scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -32,7 +32,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am index ec47c1694e..956c6c23a7 100644 --- a/testsuites/samples/minimum/Makefile.am +++ b/testsuites/samples/minimum/Makefile.am @@ -7,19 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = all -C_FILES = init.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -33,7 +33,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am index 562b7bb1a1..901843cddc 100644 --- a/testsuites/samples/paranoia/Makefile.am +++ b/testsuites/samples/paranoia/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = all -C_FILES = init.c paranoia.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 paranoia.c system.h DOCTYPES = doc DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -41,7 +38,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am index ad1bf6f63e..862ef229ac 100644 --- a/testsuites/samples/pppd/Makefile.am +++ b/testsuites/samples/pppd/Makefile.am @@ -7,18 +7,15 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io event semaphore -C_FILES = init.c pppdapp.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) +noinst_LIBRARIES = lib.a +lib_a_SOURCES = init.c pppdapp.c netconfig.h system.h -H_FILES = netconfig.h system.h - -SRCS = $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -33,8 +30,6 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(H_FILES) - CLEANFILES = $(TMPINSTALL_FILES) include $(top_srcdir)/../automake/local.am diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am index 995218a35b..177e9cc6ec 100644 --- a/testsuites/samples/ticker/Makefile.am +++ b/testsuites/samples/ticker/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io -C_FILES = init.c tasks.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 tasks.c system.h DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -35,7 +32,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am index b902a9a4f2..b3f764132f 100644 --- a/testsuites/samples/unlimited/Makefile.am +++ b/testsuites/samples/unlimited/Makefile.am @@ -7,22 +7,19 @@ PGM = ${ARCH}/$(SAMPLE).exe MANAGERS = io event -C_FILES = init.c test1.c test2.c test3.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 test1.c test2.c test3.c system.h DOCTYPES = doc scn DOCS = $(DOCTYPES:%=$(SAMPLE).%) -SRCS = $(DOCS) $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) +SRCS = $(DOCS) +OBJS = $(lib_a_OBJECTS) PRINT_SRCS = $(DOCS) 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)/sample.am @@ -35,7 +32,7 @@ all-local: $(TMPINSTALL_FILES) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -EXTRA_DIST = $(C_FILES) $(DOCS) +EXTRA_DIST = $(DOCS) CLEANFILES = $(TMPINSTALL_FILES) -- cgit v1.2.3