From 162cc991087476690319786bb83b640b5301165e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:59:42 +0000 Subject: 2002-08-11 Ralf Corsepius * canbus/Makefile.am: Use .$(OBJEXT) instead of .o. * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * irq/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. * vectors/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 12 ++++++++++++ c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am | 4 ++-- c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am | 6 +++--- 10 files changed, 30 insertions(+), 18 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 296f6ebd38..de8f172a18 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,15 @@ +2002-08-11 Ralf Corsepius + + * canbus/Makefile.am: Use .$(OBJEXT) instead of .o. + * clock/Makefile.am: Use .$(OBJEXT) instead of .o. + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * irq/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. + * vectors/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-07-21 Ralf Corsepius * start/Makefile.am: Eliminate PGM. diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am index 23c225798d..2d3588dda5 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/canbus.rel C_FILES = canbus.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/powerpc/eth_comm/clock/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am index d3e85810c1..cce6de00a4 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am @@ -6,7 +6,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/clock C_FILES = p_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/powerpc/eth_comm/console/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am index cb88cbdb35..cdf040e038 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/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/powerpc/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am index f6605c0f61..1e7076c84b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am @@ -6,12 +6,12 @@ include_bspdir = $(includedir)/bsp C_FILES = irq.c irq_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_bsp_HEADERS = irq.h S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) $(S_O_FILES) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am index 341b6ae628..567c68904f 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/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)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am index d00014c239..09e34051d9 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/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) @@ -15,16 +15,16 @@ 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) $(ARCH)/start.o $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) -.PRECIOUS: $(ARCH)/start.o +.PRECIOUS: $(ARCH)/start.$(OBJEXT) EXTRA_DIST = start.S diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am index 7fdffd197a..25b2823bc9 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am @@ -9,7 +9,7 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c cpuinit.c \ main.c mmutlbtab.c sbrk.c gnatinstallhandler.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/powerpc/eth_comm/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am index f44a1c9f7a..51662c9a8e 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am @@ -4,13 +4,13 @@ C_FILES = vectors_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) include_bspdir = $(includedir)/bsp include_bsp_HEADERS = vectors.h S_FILES = vectors.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) OBJS = $(S_O_FILES) $(C_O_FILES) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am index edcbda8bbd..0c74b1cab8 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am @@ -13,10 +13,10 @@ BSP_PIECES = clock irq startup start canbus vectors 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)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ ../@exceptions@/$(ARCH)/rtems-cpu.rel \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3