2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* startup/Makefile.am: Misc cleanups and fixes.
	* wrapup/Makefile.am: Misc cleanups and fixes.
This commit is contained in:
Ralf Corsepius
2003-12-11 06:16:52 +00:00
parent 898db757da
commit 036b9e21b6
3 changed files with 24 additions and 14 deletions

View File

@@ -1,3 +1,8 @@
2003-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* startup/Makefile.am: Misc cleanups and fixes.
* wrapup/Makefile.am: Misc cleanups and fixes.
2003-12-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add preinstallation dirstamp support.

View File

@@ -36,23 +36,28 @@ AM_CFLAGS += $(LIBC_DEFINES)
$(PGM): $(startup_rel_OBJECTS)
$(make-rel)
${ARCH}/libno-ctor.a: $(ARCH)/no-ctor.$(OBJEXT)
if HAS_CXX
project_lib_DATA = ${ARCH}/libno-ctor$(LIB_VARIANT).a
${ARCH}/libno-ctor$(LIB_VARIANT).a: $(ARCH)/no-ctor.$(OBJEXT)
$(AR) -cvr $@ $<
$(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a: ${ARCH}/libno-ctor.a
$(INSTALL_DATA) $< $@
$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rtems-ctor.$(OBJEXT)
$(INSTALL_DATA) $< $@
if HAS_CXX
all-local: $(PGM) $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \
$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
else
all-local: $(PGM)
project_lib_DATA += ${ARCH}/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
endif
all-local: $(PGM) $(TMPINSTALL_FILES)
EXTRA_DIST = bspclean.c bspstart.c exit.c main.c no-ctor.c rtems-ctor.cc \
setvec.c
if HAS_CXX
${PROJECT_RELEASE}/lib/libno-ctor$(LIB_VARIANT).a: ${ARCH}/libno-ctor$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/libno-ctor$(LIB_VARIANT).a
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/libno-ctor$(LIB_VARIANT).a
${PROJECT_RELEASE}/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT): ${ARCH}/rtems-ctor$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp)
$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
endif
include $(top_srcdir)/../../../../automake/local.am

View File

@@ -18,8 +18,8 @@ endif
GENERIC_FILES = $(GENERIC_MP_REL_FILES)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \
../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(GENERIC_FILES), \
OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \
$(foreach piece, $(GENERIC_FILES), \
../../../$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a