From 0fe6737b9973d17b92a89b0d1c1a4a4b267d99c7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:15:57 +0000 Subject: 2002-08-11 Ralf Corsepius * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * network/Makefile.am: Use .$(OBJEXT) instead of .o. * start/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/i386/i386ex/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/i386/i386ex/clock/Makefile.am | 2 +- c/src/lib/libbsp/i386/i386ex/console/Makefile.am | 2 +- c/src/lib/libbsp/i386/i386ex/network/Makefile.am | 2 +- c/src/lib/libbsp/i386/i386ex/start/Makefile.am | 8 ++++---- c/src/lib/libbsp/i386/i386ex/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/i386ex/timer/Makefile.am | 2 +- c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am | 2 +- c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am | 2 +- c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am | 2 +- c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am | 8 ++++---- c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am | 2 +- c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am | 4 ++-- 16 files changed, 44 insertions(+), 24 deletions(-) diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 17b72564a7..2d32d04837 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,13 @@ +2002-08-11 Ralf Corsepius + + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * network/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/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-22 Ralf Corsepius * startup/bspstart.c: Per PR252 removed hack that tripled size of diff --git a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am index 15cce30d51..2c3d288ef5 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = ckinit.c -clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am index 37c030049d..6d338112cf 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am @@ -10,7 +10,7 @@ PGM = $(ARCH)/console.rel ## sources C_FILES = console.c -console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am index 2d99bb53ab..2eaac84c5b 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/network.rel C_FILES = network.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = netexterns.h uti596.h diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am index 37d3b7f38d..c5d850b2a3 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am @@ -3,7 +3,7 @@ ## S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = 80386ex.h 80386ex.inc macros.inc @@ -17,12 +17,12 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am index f71fd12c91..8a395a10e2 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am @@ -10,10 +10,10 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ idt.c irq.c irq_init.c i386-stub.c i386-stub-glue.c uart.c \ gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) diff --git a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am index 4fc3f444b1..b538b7cd97 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am @@ -7,7 +7,7 @@ PGM = $(ARCH)/timer.rel C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am index 4461003e32..d9f9774090 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am @@ -11,8 +11,8 @@ endif BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index f78b5bd9dd..47ed65f51a 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,3 +1,13 @@ +2002-08-11 Ralf Corsepius + + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * network/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/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-20 Ralf Corsepius * start/Makefile.am: Eliminate PGM. diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am index 1d25eccd7a..8b58f4ee57 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = ckinit.c rtc.c -clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am index 37c030049d..6d338112cf 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am @@ -10,7 +10,7 @@ PGM = $(ARCH)/console.rel ## sources C_FILES = console.c -console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am index 19af03d9ed..dca54ed807 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/network.rel C_FILES = ne2000.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/i386/ts_386ex/start/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am index de988d61c2..9d1019a13c 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am @@ -3,7 +3,7 @@ ## S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) @@ -17,12 +17,12 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am index 3950969144..e3381f5399 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am @@ -10,10 +10,10 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ idt.c irq.c irq_init.c i386-stub.c i386-stub-glue.c uart.c \ gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am index 350190ab8e..a86880de81 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am @@ -8,7 +8,7 @@ PGM = $(ARCH)/timer.rel ## sources C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am index 4461003e32..d9f9774090 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am @@ -11,8 +11,8 @@ endif BSP_FILES = startup clock console timer $(NETWORK) # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/i386/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3