From 87f4b9c29c81f68393a9b5be9f86ac0eccdf8ea3 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Aug 2002 06:42:11 +0000 Subject: 2002-08-11 Ralf Corsepius * console/Makefile.am: Use .$(OBJEXT) instead of .o. * i2c/Makefile.am: Use .$(OBJEXT) instead of .o. * nvram/Makefile.am: Use .$(OBJEXT) instead of .o. * start/Makefile.am: Use .$(OBJEXT) instead of .o. * startup/Makefile.am: Use .$(OBJEXT) instead of .o. * tod/Makefile.am: Use .$(OBJEXT) instead of .o. * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. --- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/start/Makefile.am | 12 ++++++------ c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am | 4 ++-- 8 files changed, 23 insertions(+), 13 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index 7665c5ae67..02e01690b7 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,13 @@ +2002-08-11 Ralf Corsepius + + * console/Makefile.am: Use .$(OBJEXT) instead of .o. + * i2c/Makefile.am: Use .$(OBJEXT) instead of .o. + * nvram/Makefile.am: Use .$(OBJEXT) instead of .o. + * start/Makefile.am: Use .$(OBJEXT) instead of .o. + * startup/Makefile.am: Use .$(OBJEXT) instead of .o. + * tod/Makefile.am: Use .$(OBJEXT) instead of .o. + * wrapup/Makefile.am: Use .$(OBJEXT) instead of .o. + 2002-08-05 Joel Sherrill * Per PR260 eliminate use of make-target-options. This impacted diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am index 6f7b4e1391..402a6c6793 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/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/m68k/mcf5206elite/i2c/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am index 167f773b4a..dbd461baac 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/i2c.rel C_FILES = i2c.c i2cdrv.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/m68k/mcf5206elite/nvram/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am index 9922756e28..6f5c254231 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/Makefile.am @@ -6,7 +6,7 @@ PGM = $(ARCH)/nvram.rel C_FILES = nvram.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/m68k/mcf5206elite/start/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/start/Makefile.am index 6d6c7a4021..8cba6c0249 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/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/m68k/mcf5206elite/startup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am index c5249a00a8..53be4818cf 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/Makefile.am @@ -10,7 +10,7 @@ PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c m68kpretaskinghook.c \ bspstart.c init5206e.c bootcard.c main.c sbrk.c setvec.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/m68k/mcf5206elite/tod/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am index 64c7425ecf..e1c06f83b9 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/tod/Makefile.am @@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/tod.rel C_FILES = ds1307.c todcfg.c tod.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/m68k/mcf5206elite/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am index f18bd77538..c1f11d6740 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am @@ -7,8 +7,8 @@ BSP_PIECES = startup console i2c tod nvram CPU_PIECES = clock console timer mbus # 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/misc/$(ARCH)/memcpy.o) \ +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/memcpy.$(OBJEXT)) \ $(foreach piece, $(CPU_PIECES), $(wildcard \ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)) \ $(wildcard \ -- cgit v1.2.3