From 9a7e074deb635ab855ff65afc57ed937149886ef Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:42:53 +0000 Subject: 2000-09-04 Ralf Corsepius * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, start/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am: Include compile.am --- c/src/lib/libbsp/i960/cvme961/ChangeLog | 6 ++++++ c/src/lib/libbsp/i960/cvme961/clock/Makefile.am | 1 + c/src/lib/libbsp/i960/cvme961/console/Makefile.am | 1 + c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am | 1 + c/src/lib/libbsp/i960/cvme961/start/Makefile.am | 1 + c/src/lib/libbsp/i960/cvme961/startup/Makefile.am | 1 + c/src/lib/libbsp/i960/cvme961/timer/Makefile.am | 1 + c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am | 5 +++-- 8 files changed, 15 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog index c00bec1627..ed891c11dc 100644 --- a/c/src/lib/libbsp/i960/cvme961/ChangeLog +++ b/c/src/lib/libbsp/i960/cvme961/ChangeLog @@ -1,4 +1,10 @@ +2000-09-04 Ralf Corsepius + + * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, + start/Makefile.am, startup/Makefile.am, timer/Makefile.am, + wrapup/Makefile.am: Include compile.am + 2000-08-10 Joel Sherrill * ChangeLog: New file. diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am index 3e08045c00..bb7f99ff8d 100644 --- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.am b/c/src/lib/libbsp/i960/cvme961/console/Makefile.am index d4e5619fac..26f76d08b9 100644 --- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/console/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am index f013cd37b0..3ebcc58e19 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am @@ -12,6 +12,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.am b/c/src/lib/libbsp/i960/cvme961/start/Makefile.am index e5a9f26a27..86053b9e99 100644 --- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/start/Makefile.am @@ -12,6 +12,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am index 7a31b8edf8..77a30da771 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am @@ -15,6 +15,7 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am index c85ca86376..d5dc842507 100644 --- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am @@ -15,6 +15,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am index 6e8b8865bd..41a2cad2ae 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am @@ -15,12 +15,13 @@ endif BSP_FILES = startup clock console timer $(BSP_MP_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ - $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3