From 3f5232acb61216ca52131b6a98ac5f6460abf7b4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 15:11:52 +0000 Subject: 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, irq/Makefile.am, motorola/Makefile.am, openpic/Makefile.am, pci/Makefile.am, residual/Makefile.am, start/Makefile.am, startup/Makefile.am, vectors/Makefile.am, vme/Makefile.am. Use automake compilation rules. Rename clock.rel to pclock.rel (Conflict with libcpu). * clock/Makefile.am, console/Makefile.am, irq/Makefile.am, motorola/Makefile.am, openpic/Makefile.am, pci/Makefile.am, residual/Makefile.am, start/Makefile.am, startup/Makefile.am, vectors/Makefile.am, vme/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile.am: Reflect changes above. --- c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am index 89ed3c2caa..3dfa42fcc4 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am @@ -2,12 +2,14 @@ ## $Id$ ## -BSP_PIECES = clock console irq openpic pci residual startup vectors motorola \ - vme - # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ +OBJS = ../startup$(LIB_VARIANT).rel ../pclock$(LIB_VARIANT).rel \ + ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ + ../openpic$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \ + ../residual$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel \ + ../motorola$(LIB_VARIANT).rel ../vme$(LIB_VARIANT).rel +OBJS += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \ ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \ ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \ -- cgit v1.2.3