diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-05 15:43:04 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-05 15:43:04 +0000 |
| commit | 60d9d9d1b68595534c8bc3854e1b10f7b292f4b3 (patch) | |
| tree | d7fa891a58feb6376921b4fcd625008c762ee717 | |
| parent | 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-60d9d9d1b68595534c8bc3854e1b10f7b292f4b3.tar.bz2 | |
2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* console/Makefile.am, start/Makefile.am, startup/Makefile.am,
wrapup/Makefile.am, clock/Makefile.am: Include compile.am
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/clock/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/console/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/start/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/startup/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am | 5 |
6 files changed, 12 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog index 101734ce64..597b580dcc 100644 --- a/c/src/lib/libbsp/i960/i960sim/ChangeLog +++ b/c/src/lib/libbsp/i960/i960sim/ChangeLog @@ -1,3 +1,8 @@ +2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * console/Makefile.am, start/Makefile.am, startup/Makefile.am, + wrapup/Makefile.am, clock/Makefile.am: Include compile.am + 2000-08-10 Joel Sherrill <joel@OARcorp.com> * ChangeLog: New file. diff --git a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am b/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am index 7c33173275..17ecfe4e15 100644 --- a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/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/i960sim/console/Makefile.am b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am index 161324e7e3..e4c3bdfdfe 100644 --- a/c/src/lib/libbsp/i960/i960sim/console/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am @@ -17,6 +17,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/i960sim/start/Makefile.am b/c/src/lib/libbsp/i960/i960sim/start/Makefile.am index 9005137d73..e827e0d79e 100644 --- a/c/src/lib/libbsp/i960/i960sim/start/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/start/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/i960sim/startup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am index fec84657aa..4dd270fbea 100644 --- a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/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/i960sim/wrapup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am index ae52204fdb..81b4604e8a 100644 --- a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am @@ -7,12 +7,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 BSP_FILES = startup clock console timer 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 |