From dc17e8ed17eb3e47e8f6da12854691147d9732fe Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 07:02:19 +0000 Subject: 2002-08-11 Ralf Corsepius * bootloader/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. * motorola/Makefile.am: Use .$(OBJEXT) instead of .o. * openpic/Makefile.am: Use .$(OBJEXT) instead of .o. * pci/Makefile.am: Use .$(OBJEXT) instead of .o. * residual/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/motorola_powerpc/ChangeLog | 15 +++++++++++++++ .../powerpc/motorola_powerpc/bootloader/Makefile.am | 10 +++++----- .../lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am | 2 +- .../libbsp/powerpc/motorola_powerpc/console/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am | 4 ++-- .../libbsp/powerpc/motorola_powerpc/motorola/Makefile.am | 2 +- .../libbsp/powerpc/motorola_powerpc/openpic/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am | 2 +- .../libbsp/powerpc/motorola_powerpc/residual/Makefile.am | 2 +- .../lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am | 12 ++++++------ .../libbsp/powerpc/motorola_powerpc/startup/Makefile.am | 2 +- .../libbsp/powerpc/motorola_powerpc/vectors/Makefile.am | 4 ++-- .../libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am | 8 ++++---- 13 files changed, 41 insertions(+), 26 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 42aa8d4272..58bd138126 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -13,6 +13,21 @@ * vectors/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. +2002-08-11 Ralf Corsepius + + * bootloader/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. + * motorola/Makefile.am: Use .$(OBJEXT) instead of .o. + * openpic/Makefile.am: Use .$(OBJEXT) instead of .o. + * pci/Makefile.am: Use .$(OBJEXT) instead of .o. + * residual/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-25 Ralf Corsepius * bootloader/Makefile.am: Install bootloader.o. diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am index ea6815b32d..e3eba8d1e4 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = no-exeext VPATH = @srcdir@:@srcdir@/../../shared/bootloader:@srcdir@/../../shared/console -noinst_PROGRAMS = bootloader.o +noinst_PROGRAMS = bootloader.$(OBJEXT) ## IMPORTANT: head.S must be first, T. Straumann 12/17/2001 bootloader_o_SOURCES = head.S exception.S em86real.S @@ -39,17 +39,17 @@ AM_CCASFLAGS = $(AM_CPPFLAGS) \ # # As we use very specific compilation options in this directory # we shall not use any other code. This includes the newlib libc.a -# as well as other code located in .o files in mcp750 directory. +# as well as other code located in .$(OBJEXT) files in mcp750 directory. # # NEVER remove lib.c. You have been warned... # -bootloader.o: $(bootloader_o_OBJECTS) +bootloader.$(OBJEXT): $(bootloader_o_OBJECTS) $(LD) -r -o $@ $(bootloader_o_OBJECTS) $(NM) $@ | grep ' U ' @echo "Every symbol listed should be defined in @srcdir@/ppcboot.lds" ppcbootdir = $(bsplibdir) -ppcboot_DATA = bootloader.o +ppcboot_DATA = bootloader.$(OBJEXT) ppcboot_DATA += ../../shared/bootloader/ppcboot.lds # FIXME: Tmp-install stuff to make mcp750.cfg's make-exe happy. @@ -59,7 +59,7 @@ ppcboot_DATA += ../../shared/bootloader/ppcboot.lds $(PROJECT_RELEASE)/lib/%: % $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib/bootloader.o \ +TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib/bootloader.$(OBJEXT) \ $(PROJECT_RELEASE)/lib/ppcboot.lds all-local: $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am index d3e85810c1..cce6de00a4 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/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/motorola_powerpc/console/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am index a3368abc16..72732fcfe1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am @@ -6,7 +6,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/console:@srcdir@/../../../shared C_FILES = polled_io.c uart.c console.c inch.c reboot.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = ../../shared/console/consoleIo.h ../../shared/console/keyboard.h \ ../../shared/console/uart.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am index 1e8fd1c307..c89be7350c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am @@ -6,13 +6,13 @@ VPATH = @srcdir@:@srcdir@/../../shared/irq C_FILES = irq_init.c i8259.c irq.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) # FIXME: this does give any sense here H_FILES = ../../shared/irq/irq.h S_FILES = irq_asm.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/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am index d2b877c735..8cca9ef976 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am @@ -6,7 +6,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/motorola C_FILES = motorola.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) # FIXME: This doesn't give any sense here H_FILES = ../../shared/motorola/motorola.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am index 64e6879cc8..d369d53656 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am @@ -9,7 +9,7 @@ C_FILES = openpic.c H_FILES = ../../shared/openpic/openpic.h -OBJS = $(C_FILES:%.c=$(ARCH)/%.o) +OBJS = $(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/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am index a1f05ebce6..a3a2124177 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am @@ -6,7 +6,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/pci C_FILES = pci.c detect_raven_bridge.c pcifinddevice.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = ../../shared/pci/pci.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am index 189c21642a..c00ced7237 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am @@ -6,7 +6,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/residual C_FILES = residual.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = ../../shared/residual/pnp.h ../../shared/residual/residual.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am index f7e2546c2d..17e103b4d5 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am @@ -5,7 +5,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/start 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,15 +17,15 @@ 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) include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am index 01d86fef90..525ed2c06e 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am @@ -7,7 +7,7 @@ VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../sha C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.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/motorola_powerpc/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am index 8e52b4169d..5cf4a949c6 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am @@ -6,12 +6,12 @@ VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/vectors C_FILES = vectors_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) H_FILES = ../../shared/vectors/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/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am index 3134a7d0f5..fcad49f315 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am @@ -5,11 +5,11 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \ +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(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