From 982fceec50c8e36feee143b9944b995d62dd6ff6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 07:13:50 +0000 Subject: 2002-08-11 Ralf Corsepius * 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. --- c/src/lib/libbsp/unix/posix/ChangeLog | 9 +++++++++ c/src/lib/libbsp/unix/posix/clock/Makefile.am | 2 +- c/src/lib/libbsp/unix/posix/console/Makefile.am | 2 +- c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am | 2 +- c/src/lib/libbsp/unix/posix/startup/Makefile.am | 12 ++++++------ c/src/lib/libbsp/unix/posix/timer/Makefile.am | 2 +- c/src/lib/libbsp/unix/posix/wrapup/Makefile.am | 2 +- 7 files changed, 20 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp/unix') diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index f15653312c..3dd3c71946 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/ChangeLog @@ -1,3 +1,12 @@ +2002-08-11 Ralf Corsepius + + * 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 * wrapup/Makefile.am: Eliminate TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/unix/posix/clock/Makefile.am b/c/src/lib/libbsp/unix/posix/clock/Makefile.am index c3e561dc17..e19650afae 100644 --- a/c/src/lib/libbsp/unix/posix/clock/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/clock/Makefile.am @@ -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) diff --git a/c/src/lib/libbsp/unix/posix/console/Makefile.am b/c/src/lib/libbsp/unix/posix/console/Makefile.am index cb88cbdb35..cdf040e038 100644 --- a/c/src/lib/libbsp/unix/posix/console/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/console/Makefile.am @@ -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) diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am index 725cc9d1e3..7a4f6a434e 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am @@ -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) diff --git a/c/src/lib/libbsp/unix/posix/startup/Makefile.am b/c/src/lib/libbsp/unix/posix/startup/Makefile.am index 0f275dd05d..9b7153c8ef 100644 --- a/c/src/lib/libbsp/unix/posix/startup/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/startup/Makefile.am @@ -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 diff --git a/c/src/lib/libbsp/unix/posix/timer/Makefile.am b/c/src/lib/libbsp/unix/posix/timer/Makefile.am index 6fec4267c3..1b09883b6b 100644 --- a/c/src/lib/libbsp/unix/posix/timer/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/timer/Makefile.am @@ -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) diff --git a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am index bc8bceae26..6ec070f3f8 100644 --- a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am @@ -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 -- cgit v1.2.3