From 9ace8a747cd4db265177d9fdc5ec086c06bc990b Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 11 Aug 2002 06:27:05 +0000
Subject: 2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
 	* console/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/c4x/c4xsim/ChangeLog              |  9 +++++++++
 c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am      |  2 +-
 c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am    |  2 +-
 c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am      | 12 ++++++------
 c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am    |  2 +-
 c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am      |  2 +-
 c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am     |  2 +-
 c/src/lib/libbsp/i960/i960sim/ChangeLog            |  9 +++++++++
 c/src/lib/libbsp/i960/i960sim/clock/Makefile.am    |  2 +-
 c/src/lib/libbsp/i960/i960sim/console/Makefile.am  |  4 ++--
 c/src/lib/libbsp/i960/i960sim/start/Makefile.am    | 12 ++++++------
 c/src/lib/libbsp/i960/i960sim/startup/Makefile.am  |  2 +-
 c/src/lib/libbsp/i960/i960sim/timer/Makefile.am    |  2 +-
 c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am   |  4 ++--
 c/src/lib/libbsp/i960/rxgen960/ChangeLog           |  9 +++++++++
 c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am   |  2 +-
 c/src/lib/libbsp/i960/rxgen960/console/Makefile.am |  2 +-
 c/src/lib/libbsp/i960/rxgen960/start/Makefile.am   | 12 ++++++------
 c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am |  2 +-
 c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am   |  2 +-
 c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am  |  4 ++--
 c/src/lib/libbsp/or32/orp/ChangeLog                |  9 +++++++++
 c/src/lib/libbsp/or32/orp/clock/Makefile.am        |  2 +-
 c/src/lib/libbsp/or32/orp/console/Makefile.am      |  2 +-
 c/src/lib/libbsp/or32/orp/start/Makefile.am        | 12 ++++++------
 c/src/lib/libbsp/or32/orp/startup/Makefile.am      |  4 ++--
 c/src/lib/libbsp/or32/orp/timer/Makefile.am        |  2 +-
 c/src/lib/libbsp/or32/orp/wrapup/Makefile.am       |  4 ++--
 28 files changed, 85 insertions(+), 49 deletions(-)

(limited to 'c/src')

diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 3bbaeae783..630dae44b8 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
+ 	* console/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 <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am
index 9b0eb9ac26..4768d915c5 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/clock.rel
 
 C_FILES = 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/c4x/c4xsim/console/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am
index 65d65530b1..7b72e4b172 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am
@@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
 PGM = $(ARCH)/console.rel
 
 C_FILES = console.c consolereserveresources.c debugio.c simio.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/c4x/c4xsim/start/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am
index d00014c239..09e34051d9 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/start/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/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/c4x/c4xsim/startup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am
index 39d986f3a6..90c6e31cb8 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am
@@ -10,7 +10,7 @@ PGM = $(ARCH)/startup.rel
 C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c main.c bootcard.c sbrk.c \
     setvec.c c3xspurious.c c4xspurious.c bspspuriousinit.c spurious.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/c4x/c4xsim/timer/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am
index 7ee76eb7cc..70a4aa569b 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.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/c4x/c4xsim/wrapup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am
index 325bf41f89..83f7c867a5 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am
@@ -7,7 +7,7 @@ BSP_PIECES = startup console clock timer
 CPU_PIECES =
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
     $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel)
 LIB = $(ARCH)/libbsp.a
 
diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog
index 60a537a91b..62aaafb5c2 100644
--- a/c/src/lib/libbsp/i960/i960sim/ChangeLog
+++ b/c/src/lib/libbsp/i960/i960sim/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
+ 	* console/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 <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: Eliminate PGM.
diff --git a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am b/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am
index 9a9cd06381..5a4255d1e2 100644
--- a/c/src/lib/libbsp/i960/i960sim/clock/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/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/i960/i960sim/console/Makefile.am b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am
index 90fae92d30..e0fa960c7b 100644
--- a/c/src/lib/libbsp/i960/i960sim/console/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/console/Makefile.am
@@ -8,10 +8,10 @@ VPATH = @srcdir@:@srcdir@/../../../shared
 PGM = $(ARCH)/console.rel
 
 C_FILES = console-io.c console-polled.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = mon-syscalls.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/i960/i960sim/start/Makefile.am b/c/src/lib/libbsp/i960/i960sim/start/Makefile.am
index c12bf7aa1b..2eaae7053f 100644
--- a/c/src/lib/libbsp/i960/i960sim/start/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/start/Makefile.am
@@ -3,7 +3,7 @@
 ##
 
 C_FILES = start.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_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.c
 
diff --git a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am
index 5d1f10012f..90db46192a 100644
--- a/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/startup/Makefile.am
@@ -9,7 +9,7 @@ PGM = $(ARCH)/startup.rel
 
 C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.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/i960/i960sim/timer/Makefile.am b/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am
index e033aad053..157b02f0fa 100644
--- a/c/src/lib/libbsp/i960/i960sim/timer/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/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/i960/i960sim/wrapup/Makefile.am b/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am
index d094f1281b..6acba88129 100644
--- a/c/src/lib/libbsp/i960/i960sim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/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
diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
index a57a6adb80..e194cab6c6 100644
--- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog
+++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
+ 	* console/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-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am:
diff --git a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am
index 9971dae61c..efd98a00a4 100644
--- a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.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/i960/rxgen960/console/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am
index 91304e6dbc..5fedcb6bdf 100644
--- a/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/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/i960/rxgen960/start/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
index c9afaffc2b..356f6f80b9 100644
--- a/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
@@ -3,7 +3,7 @@
 ##
 
 S_FILES = rxgen_romld.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/rxgen_romld.o
+bsplib_DATA = $(PROJECT_RELEASE)/lib/rxgen_romld.$(OBJEXT)
 
-$(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).o: $(ARCH)/rxgen_romld.o
+$(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rxgen_romld.$(OBJEXT)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).o
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
 
-all-local: $(ARCH) $(OBJS) $(ARCH)/rxgen_romld.o $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(OBJS) $(ARCH)/rxgen_romld.$(OBJEXT) $(TMPINSTALL_FILES)
 
-.PRECIOUS: $(ARCH)/rxgen_romld.o
+.PRECIOUS: $(ARCH)/rxgen_romld.$(OBJEXT)
 
 EXTRA_DIST = rxgen_romld.S
 
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
index e6d67def8b..09886d6a48 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \
 
 S_FILES = asmfault.S asmstub.S ihandler.S
 
-OBJS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
+OBJS = $(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/i960/rxgen960/timer/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am
index ddadd28cf9..117d72753e 100644
--- a/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.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/i960/rxgen960/wrapup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am
index 0f415877a9..2bc67227fe 100644
--- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am
@@ -9,8 +9,8 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 BSP_PIECES = startup clock console timer
 
 # 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)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o)
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT))
 LIB = $(ARCH)/libbsp.a
 
 #
diff --git a/c/src/lib/libbsp/or32/orp/ChangeLog b/c/src/lib/libbsp/or32/orp/ChangeLog
index 27fcfa4142..358657614d 100644
--- a/c/src/lib/libbsp/or32/orp/ChangeLog
+++ b/c/src/lib/libbsp/or32/orp/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am: Use .$(OBJEXT) instead of .o.
+ 	* console/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-08-07	Ivan Guzvinec <ivang@opencores.org>
 
 	* configure.ac: Bender BSP renamed to OpenRisc Reference Platform 
diff --git a/c/src/lib/libbsp/or32/orp/clock/Makefile.am b/c/src/lib/libbsp/or32/orp/clock/Makefile.am
index 3975bba608..3efff6bfdf 100644
--- a/c/src/lib/libbsp/or32/orp/clock/Makefile.am
+++ b/c/src/lib/libbsp/or32/orp/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/or32/orp/console/Makefile.am b/c/src/lib/libbsp/or32/orp/console/Makefile.am
index 18e8af2301..e84bfb1bca 100644
--- a/c/src/lib/libbsp/or32/orp/console/Makefile.am
+++ b/c/src/lib/libbsp/or32/orp/console/Makefile.am
@@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
 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/or32/orp/start/Makefile.am b/c/src/lib/libbsp/or32/orp/start/Makefile.am
index 6a5f267d10..2c9a9d757f 100644
--- a/c/src/lib/libbsp/or32/orp/start/Makefile.am
+++ b/c/src/lib/libbsp/or32/orp/start/Makefile.am
@@ -3,7 +3,7 @@
 ##
 
 S_FILES = start.S
-S_O_FILES = $(S_FILES:%.c=$(ARCH)/%.o)
+S_O_FILES = $(S_FILES:%.c=$(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/or32/orp/startup/Makefile.am b/c/src/lib/libbsp/or32/orp/startup/Makefile.am
index 3f10bc8f6d..b645e015f8 100644
--- a/c/src/lib/libbsp/or32/orp/startup/Makefile.am
+++ b/c/src/lib/libbsp/or32/orp/startup/Makefile.am
@@ -9,10 +9,10 @@ PGM = $(ARCH)/startup.rel
 
 C_FILES = bsplibc.c bsppost.c bspstart.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))
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
diff --git a/c/src/lib/libbsp/or32/orp/timer/Makefile.am b/c/src/lib/libbsp/or32/orp/timer/Makefile.am
index dd37437644..387dabddf9 100644
--- a/c/src/lib/libbsp/or32/orp/timer/Makefile.am
+++ b/c/src/lib/libbsp/or32/orp/timer/Makefile.am
@@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../../shared
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c timerisr.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/or32/orp/wrapup/Makefile.am b/c/src/lib/libbsp/or32/orp/wrapup/Makefile.am
index d094f1281b..6acba88129 100644
--- a/c/src/lib/libbsp/or32/orp/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/or32/orp/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