From 66178451d59eff07ccd7e388d9c22bea455055d3 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:40:31 +0000 Subject: 2000-09-04 Ralf Corsepius * clock/Makefile.am, console/Makefile.am, irq/Makefile.am, start/Makefile.am, startup/Makefile.am, wrapup/Makefile.am: Include compile.am. --- c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog | 6 ++++++ c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am | 4 ++-- c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am | 1 + c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am | 7 ++++--- c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am | 6 +++--- c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am | 5 +++-- c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am | 1 + c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am | 9 +++++---- c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am | 5 +++-- 9 files changed, 28 insertions(+), 16 deletions(-) (limited to 'c/src/lib/libbsp/arm') diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 101734ce64..28f2b7bfee 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog @@ -1,3 +1,9 @@ +2000-09-04 Ralf Corsepius + + * clock/Makefile.am, console/Makefile.am, irq/Makefile.am, + start/Makefile.am, startup/Makefile.am, wrapup/Makefile.am: + Include compile.am. + 2000-08-10 Joel Sherrill * ChangeLog: New file. diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am index d7ef24e6b8..8a885f6201 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am index 7c33173275..17ecfe4e15 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am index d654c11ba0..964434ab5a 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am @@ -1,10 +1,10 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = @srcdir@/../../shared/comm:@srcdir@/../../shared/io +VPATH = @srcdir@:@srcdir@/../../shared/comm:@srcdir@/../../shared/io PGM = $(ARCH)/console.rel @@ -16,6 +16,7 @@ H_FILES = uart.h console_rel_OBJECTS = $(C_FILES:%.c=$(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/arm/arm_bare_bsp/include/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am index 6e4ee50f82..3a8cf5f686 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/include/Makefile.am @@ -1,10 +1,10 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h registers.h +H_FILES = bsp.h registers.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am index 473034f50e..c2ffbc5821 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -26,6 +26,7 @@ $(PROJECT_INCLUDE)/%.h: %.h PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) 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/arm/arm_bare_bsp/start/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am index e5a9f26a27..86053b9e99 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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/arm/arm_bare_bsp/startup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am index 2120b13288..e4295559e0 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am @@ -1,12 +1,13 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 VPATH = @srcdir@:@srcdir@/../../../shared -C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c gnatinstallhandler.c +C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c \ + gnatinstallhandler.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) S_FILES = @@ -15,6 +16,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) startup_rel_OBJECTS = $(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 # @@ -38,4 +40,3 @@ all: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = linkcmds include $(top_srcdir)/../../../../../../automake/local.am - diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am index d4db966c77..c5f25b1d21 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -11,6 +11,7 @@ OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # -- cgit v1.2.3