From 65e6a0f58e81bf0124349edec02e49f0a8824d54 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 23:56:57 +0000 Subject: 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, ide/Makefile.am, irq/Makefile.am, network/Makefile.am, startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, ide/Makefile.am, irq/Makefile.am, network/Makefile.am, startup/Makefile.am, vectors/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile.am: Reflect changes above. --- c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am') diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am index d90cb8a605..d893cef875 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am @@ -2,16 +2,15 @@ ## $Id$ ## -# We only build the networking device driver if HAS_NETWORKING was defined +OBJS = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ + ../ide$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ + ../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel if HAS_NETWORKING -NETWORKING = network +OBJS += ../network$(LIB_VARIANT).rel endif -BSP_PIECES = clock irq ide startup console vectors $(NETWORKING) - -# 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 += ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ + ../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \ ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8xx/clock$(LIB_VARIANT).rel \ ../../../../libcpu/powerpc/mpc8xx/console-generic$(LIB_VARIANT).rel \ -- cgit v1.2.3