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.
 	* shmsupp/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, 48 insertions, 28 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 140977639c..b115ebd03e 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/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.
+ 	* shmsupp/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: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am
index 9971dae61c..efd98a00a4 100644
--- a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am
index cb88cbdb35..cdf040e038 100644
--- a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am
index f3b7701353..d8cacc4ced 100644
--- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/shmsupp.rel
 
 C_FILES = addrconv.c getcfg.c lock.c mpisr.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/mvme136/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am
index 76356666e9..fd2d262ebf 100644
--- a/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am
@@ -5,7 +5,7 @@
 VPATH = @srcdir@:@srcdir@/../../shared
 
 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/m68k/mvme136/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am
index b35a340729..2cec301b73 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am
index fff8afcc91..8b12aeed08 100644
--- a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am
index 9b4d324f29..b5c54dae06 100644
--- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am
@@ -17,8 +17,8 @@ endif
 BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES)
 
 # 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/*/$(ARCH)/*.o) \
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
     $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB = $(ARCH)/libbsp.a
 
diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
index 33d2943834..76a16cf86d 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147s/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.
+ 	* shmsupp/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: Eliminate PGM.
diff --git a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am
index 47be8acabb..d0d9d2031f 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am
@@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../mvme147/clock
 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/mvme147s/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am
index 6d4c4d0f14..2cce41bdc0 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am
@@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../mvme147/console
 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/mvme147s/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am
index f3b7701353..d8cacc4ced 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am
@@ -6,7 +6,7 @@
 PGM = $(ARCH)/shmsupp.rel
 
 C_FILES = addrconv.c getcfg.c lock.c mpisr.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/mvme147s/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am
index 76356666e9..fd2d262ebf 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am
@@ -5,7 +5,7 @@
 VPATH = @srcdir@:@srcdir@/../../shared
 
 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/m68k/mvme147s/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am
index 385f6e478c..97c86c0ce7 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/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/mvme147s/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am
index 4dba15847c..92322ac347 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am
@@ -8,10 +8,10 @@ VPATH = @srcdir@:@srcdir@/../../mvme147/timer
 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/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am
index 9b4d324f29..b5c54dae06 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am
@@ -17,8 +17,8 @@ endif
 BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES)
 
 # 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/*/$(ARCH)/*.o) \
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
+    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \
     $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB = $(ARCH)/libbsp.a