2002-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
 	* console/Makefile.am: Use .$(OBJEXT) instead of .o.
 	* shmsupp/Makefile.am: Use .$(OBJEXT) instead of .o.
 	* startup/Makefile.am: Use .$(OBJEXT) instead of .o.
 	* timer/Makefile.am: Use .$(OBJEXT) instead of .o.
 	* wrapup/Makefile.am: Use .$(OBJEXT) instead of .o.
This commit is contained in:
Ralf Corsepius
2002-08-11 07:13:50 +00:00
parent 6fd7b93f08
commit 982fceec50
7 changed files with 20 additions and 11 deletions

View File

@@ -1,3 +1,12 @@
2002-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
* console/Makefile.am: Use .$(OBJEXT) instead of .o.
* shmsupp/Makefile.am: Use .$(OBJEXT) instead of .o.
* startup/Makefile.am: Use .$(OBJEXT) instead of .o.
* timer/Makefile.am: Use .$(OBJEXT) instead of .o.
* wrapup/Makefile.am: Use .$(OBJEXT) instead of .o.
2002-07-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Eliminate TMPINSTALL_FILES.

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/clock.rel
C_FILES = clock.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/console.rel
C_FILES = console.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/shmsupp.rel
C_FILES = addrconv.c getcfg.c cause_intr.c lock.c mpisr.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)

View File

@@ -15,14 +15,14 @@ endif
# C sources
C_FILES = bspclean.c bsplibc.c bspstart.c setvec.c $(C_MAIN_C_FILES)
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
startup_rel_OBJECTS = $(C_O_FILES)
# CC sources
CC_FILES = rtems-ctor.cc
CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o}
CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.$(OBJEXT)}
# We install the RTEMS constructor as a separate .o
# We install the RTEMS constructor as a separate .$(OBJEXT)
# so it can be easily place correctly by the compiler config file.
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
@@ -38,18 +38,18 @@ AM_CFLAGS += $(LIBC_DEFINES)
$(PGM): $(startup_rel_OBJECTS)
$(make-rel)
${ARCH}/libno-ctor.a: $(ARCH)/no-ctor.o
${ARCH}/libno-ctor.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).o: $(ARCH)/rtems-ctor.o
$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rtems-ctor.$(OBJEXT)
$(INSTALL_DATA) $< $@
if HAS_CXX
all-local: $(ARCH) $(PGM) $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \
$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o
$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT)
else
all-local: $(ARCH) $(PGM)
endif

View File

@@ -6,7 +6,7 @@
PGM = $(ARCH)/timer.rel
C_FILES = timer.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
OBJS = $(C_O_FILES)

View File

@@ -19,7 +19,7 @@ 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)/*.o)) \
OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
$(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a