From d0d73ecd45d91500ec5a1ab0e41ba353990e82ca Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:11:03 +0000 Subject: 2002-08-11 Ralf Corsepius * clock/Makefile.am: Use .$(OBJEXT) instead of .o. * console/Makefile.am: Use .$(OBJEXT) instead of .o. * irq/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/arm/arm_bare_bsp/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am | 2 +- c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am | 4 ++-- c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am | 4 ++-- c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am | 2 +- c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am | 2 +- c/src/lib/libbsp/arm/vegaplus/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am | 2 +- c/src/lib/libbsp/arm/vegaplus/console/Makefile.am | 2 +- c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am | 4 ++-- c/src/lib/libbsp/arm/vegaplus/start/Makefile.am | 10 +++++----- c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am | 2 +- c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am | 2 +- c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am | 4 ++-- 16 files changed, 48 insertions(+), 28 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 4adb34e395..87634d632c 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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. + * irq/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/arm/arm_bare_bsp/clock/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am index 9a9cd06381..5a4255d1e2 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = clockdrv.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/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am index 4fff2a0e06..81dad129ce 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am @@ -8,11 +8,11 @@ VPATH = @srcdir@:@srcdir@/../../shared/comm:@srcdir@/../../shared/io PGM = $(ARCH)/console.rel C_FILES = uart.c console.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) noinst_HEADERS = uart.h -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/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am index c2ae280cb0..401b8eff7b 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am @@ -11,8 +11,8 @@ C_FILES = irq.c irq_init.c bsp_irq_init.c S_FILES = irq_asm.S bsp_irq_asm.S include_HEADERS = irq.h -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) irq_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am index d00014c239..09e34051d9 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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/arm/arm_bare_bsp/startup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am index f9258e138f..83d3691aed 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/Makefile.am @@ -7,10 +7,10 @@ VPATH = @srcdir@:@srcdir@/../../../shared C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c \ gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = -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/arm/arm_bare_bsp/timer/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am index e033aad053..157b02f0fa 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/timer/Makefile.am @@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/timer.rel C_FILES = timerstub.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/arm/arm_bare_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am index 10d0e12046..c56ea053ab 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am @@ -5,7 +5,7 @@ BSP_PIECES = clock console startup timer irq # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index ceab10d83a..90ab939aa0 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/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. + * irq/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/arm/vegaplus/clock/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am index 9a9cd06381..5a4255d1e2 100644 --- a/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/clock/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/clock.rel C_FILES = clockdrv.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/arm/vegaplus/console/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am index 65b3ef1c25..b7f326a63f 100644 --- a/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am @@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../shared/comm:@srcdir@/../../shared/io PGM = $(ARCH)/console.rel C_FILES = uart.c 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/arm/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am index 89d62a19eb..30ce37e977 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am @@ -8,10 +8,10 @@ VPATH = @srcdir@:@srcdir@/../../shared/irq PGM = $(ARCH)/irq.rel C_FILES = irq.c irq_init.c bsp_irq_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = irq_asm.S bsp_irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include_HEADERS = irq.h diff --git a/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am index bac6e3cb66..3091779593 100644 --- a/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/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,14 +15,14 @@ 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: $(ARCH) $(OBJS) $(ARCH)/start.o $(TMPINSTALL_FILES) +all: $(ARCH) $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) EXTRA_DIST = start.S diff --git a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am index a49d13e0ca..ced06a3f89 100644 --- a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am @@ -9,7 +9,7 @@ PGM = $(ARCH)/startup.rel C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.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/arm/vegaplus/timer/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am index e033aad053..157b02f0fa 100644 --- a/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/timer/Makefile.am @@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/timer.rel C_FILES = timerstub.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/arm/vegaplus/wrapup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am index 7a93c2234a..2dd567a399 100644 --- a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am @@ -9,8 +9,8 @@ include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3