Correct oversights in previous patch

This commit is contained in:
Ralf Corsepius
2004-01-28 06:52:22 +00:00
parent cde93faf47
commit 8a1009d2c8
3 changed files with 4 additions and 33 deletions

View File

@@ -3,10 +3,11 @@
* README: Remove references to consolex.
* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am,
network/Makefile.am, startup/Makefile.am, timer/Makefile.am,
tod/Makefile.am.
tod/Makefile.am, wrapup/Makefile.am.
Use automake compilation rules.
* clock/Makefile.am, console/Makefile.am, network/Makefile.am
startup/Makefile.am, timer/Makefile.am, tod/Makefile.am: Remove.
startup/Makefile.am, timer/Makefile.am, tod/Makefile.am,
wrapup/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2004-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

View File

@@ -1,31 +0,0 @@
##
## $Id$
##
# We only build the networking device driver if HAS_NETWORKING was defined
if HAS_NETWORKING
NETWORKING_DRIVER = network
endif
BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(wildcard ../consolex/$(ARCH)/consolex.rel) \
../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
../../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel
if HAS_FPSP
OBJS += \
../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel
endif
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../../automake/lib.am
$(ARCH)/libbsp.a: $(OBJS)
$(make-library)
noinst_DATA = $(ARCH)/libbsp.a
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -3,6 +3,7 @@
* Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am
fatal/Makefile.am, network/Makefile.am, startup/Makefile.am,
timer/Makefile.am, wrapup/Makefile.am.
Use automake compilation rules.
* clock/Makefile.am, console/Makefile.am, fatal/Makefile.am,
network/Makefile.am, startup/Makefile.am, timer/Makefile.am,
wrapup/Makefile.am: Remove.