Removed building of libcpu.a. It is now the individual BSPs

responsibility to explicitly pick up the components they
require.  This makes it easier to override default implmentations.
This commit is contained in:
Joel Sherrill
2000-06-14 15:47:38 +00:00
parent bb47a3ba21
commit 134b163f42
4 changed files with 14 additions and 8 deletions

View File

@@ -15,7 +15,9 @@ BSP_PIECES = startup start canbus console $(NETWORKING)
# mpc860/vectors
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

View File

@@ -15,7 +15,9 @@ BSP_PIECES = startup console $(NETWORKING)
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))
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

View File

@@ -7,7 +7,9 @@ AUTOMAKE_OPTIONS = foreign 1.4
BSP_PIECES = clock console irq openpic pci residual startup vectors motorola
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o)
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg

View File

@@ -24,12 +24,12 @@ include $(top_srcdir)/../../../../../automake/lib.am
libcpu_a_OBJECTS = $(CPU_SPECIFIC_OBJS) $(FAMILY_OBJS)
$(LIB): $(libcpu_a_OBJECTS)
${make-library}
# ${make-library}
$(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a
#$(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a: $(LIB)
# $(INSTALL_DATA) $< $@
#
#TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a
all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)