From 761feae995c80450bb29ec3090cb1e74aa0aa3ac Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Sep 2000 15:51:09 +0000 Subject: 2000-09-04 Ralf Corsepius * console/Makefile.am, network/Makefile.am, startup/Makefile.am, wrapup/Makefile.am: Include compile.am --- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am | 5 +++-- c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am | 5 +++-- c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am | 9 +++++---- c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am | 13 +++++++------ 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index 06049d154b..a51d026405 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,8 @@ +2000-09-04 Ralf Corsepius + + * console/Makefile.am, network/Makefile.am, startup/Makefile.am, + wrapup/Makefile.am: Include compile.am + 2000-08-30 Ralf Corsepius * configure.in: Add RTEMS_PROG_CC_FOR_TARGET, RTEMS_CANONICAL_TOOLS diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index fbbb0bf6c2..452cbdb833 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/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/powerpc/mbx8xx/console/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am index 82b58ef82e..26f76d08b9 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -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/powerpc/mbx8xx/include/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am index ac0bb3566f..6c4e41dd5d 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am index 795c36566f..82809cccf9 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -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/powerpc/mbx8xx/startup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am index 3b2eb17f8d..1047f49ab7 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -8,8 +8,8 @@ VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c imbx8xx.c main.c \ - mmutlbtab.c sbrk.c setvec.c gnatinstallhandler.c +C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c imbx8xx.c \ + main.c mmutlbtab.c sbrk.c setvec.c gnatinstallhandler.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) S_FILES = start.s @@ -18,6 +18,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/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am index 964d9c0c7e..f8dc756f75 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -12,16 +12,17 @@ endif BSP_PIECES = startup console $(NETWORKING) # pieces to pick up out of libcpu/ppc # CPU_PIECES = mpc8xx/clock mpc8xx/console-generic mpc8xx/cpm \ - mpc8xx/mmu mpc8xx/timer mpc8xx/vectors +# mpc8xx/mmu mpc8xx/timer mpc8xx/vectors # 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)/shared/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ + $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(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