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.
 	* network/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.

16 files changed, 47 insertions, 27 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 4d1bf321b7..7369364d45 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
@@ -1,3 +1,13 @@
+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.
+ 	* network/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-05	Joel Sherrill <joel@OARcorp.com>
 
 	* Per PR260 eliminate use of make-target-options.  This impacted
diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am
index 9971dae61c..efd98a00a4 100644
--- a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am
index cb88cbdb35..cdf040e038 100644
--- a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/network/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am
index d18af65f58..7f7adcfabf 100644
--- a/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am
index d00014c239..09e34051d9 100644
--- a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am
index b35a340729..2cec301b73 100644
--- a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am
@@ -9,7 +9,7 @@ PGM = $(ARCH)/startup.rel
 
 C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c \
     m68kpretaskinghook.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/gen68302/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am
index fff8afcc91..8b12aeed08 100644
--- a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am
@@ -6,10 +6,10 @@
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = timerisr.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/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am
index e5761a5824..1659e5f6ce 100644
--- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am
@@ -10,8 +10,8 @@ endif
 BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER)
 
 # 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))
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index 3ae58fce04..c063bfce63 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,13 @@
+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.
+ 	* network/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-05	Joel Sherrill <joel@OARcorp.com>
 
 	* Per PR260 eliminate use of make-target-options.  This impacted
diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am
index 81d1deee68..5f9ae65224 100644
--- a/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/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/m68k/gen68360/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am
index be6a83d74d..a9d188b71a 100644
--- a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/console.rel
 
 C_FILES = console.c consolereserveresources.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/gen68360/network/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.am
index d18af65f58..7f7adcfabf 100644
--- a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/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/m68k/gen68360/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/start/Makefile.am
index d00014c239..09e34051d9 100644
--- a/c/src/lib/libbsp/m68k/gen68360/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/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/gen68360/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am
index ff1a97e789..b95beab2c5 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am
@@ -11,7 +11,7 @@ C_FILES = alloc360.c bspclean.c bsplibc.c bsppost.c m68kpretaskinghook.c \
     bspstart.c init68360.c bootcard.c main.c sbrk.c setvec.c \
     gnatinstallhandler.c m68k-stub.c rtems-stub-glue.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/gen68360/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am
index 7ee76eb7cc..70a4aa569b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/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/m68k/gen68360/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am
index 1173f171e0..9fda726ce7 100644
--- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am
@@ -10,8 +10,8 @@ endif
 BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER)
 
 # 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)) \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 LIB = $(ARCH)/libbsp.a