From 66f3fad98d96e6ba59c0650bf1ab119d5447df7f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:43:13 +0000 Subject: 2000-09-04 Ralf Corsepius * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am, start/Makefile.am: Include compile.am --- c/src/lib/libbsp/i960/rxgen960/ChangeLog | 6 ++++++ c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am | 1 + c/src/lib/libbsp/i960/rxgen960/console/Makefile.am | 1 + c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am | 1 + c/src/lib/libbsp/i960/rxgen960/start/Makefile.am | 1 + c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am | 1 + c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am | 1 + c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am | 5 +++-- 8 files changed, 15 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog index 101734ce64..47173befad 100644 --- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog +++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog @@ -1,3 +1,9 @@ +2000-09-04 Ralf Corsepius + + * clock/Makefile.am, console/Makefile.am, shmsupp/Makefile.am, + startup/Makefile.am, timer/Makefile.am, wrapup/Makefile.am, + start/Makefile.am: Include compile.am + 2000-08-10 Joel Sherrill * ChangeLog: New file. diff --git a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am index 3e08045c00..bb7f99ff8d 100644 --- a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/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/rxgen960/console/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am index 10b41a8864..7a1578834d 100644 --- a/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/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/rxgen960/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am index 7e28b30954..ad92f76f87 100644 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/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/rxgen960/start/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am index cfa756f655..2ae95fce97 100644 --- a/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/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/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am index bdd6297231..1252d54181 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am @@ -24,6 +24,7 @@ S_FILES = asmfault.S asmstub.S ihandler.S OBJS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) 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/rxgen960/timer/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am index ceb29504da..04577b068c 100644 --- a/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/timer/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/rxgen960/wrapup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am index 3cf65c86c2..72693524d5 100644 --- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am @@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am if HAS_MP @@ -19,8 +20,8 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # -- cgit v1.2.3