2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* clock/Makefile.am: Eliminate VPATH.
	* console/Makefile.am: Eliminate VPATH.
	* irq/Makefile.am: Eliminate VPATH.
	* network/Makefile.am: Eliminate VPATH.
	* startup/Makefile.am: Eliminate VPATH.

6 files changed, 31 insertions, 32 deletions

diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index 0f830646ba..dad0461813 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am: Eliminate VPATH.
+	* console/Makefile.am: Eliminate VPATH.
+	* irq/Makefile.am: Eliminate VPATH.
+	* network/Makefile.am: Eliminate VPATH.
+	* startup/Makefile.am: Eliminate VPATH.
+
 2003-12-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	PR 545/bsps
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am
index f20d3ae2c4..4c206b4872 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am
@@ -2,22 +2,14 @@
 ## $Id$
 ##
 
-VPATH = @srcdir@:@srcdir@/../../shared/clock
-
 C_FILES = p_clock.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
 
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+# the .o files built here will be put into libbsp.a by ../wrapup/Makefile
 
-all-local: $(OBJS)
+noinst_DATA = $(OBJS)
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am
index 9f4fde7145..c03b8ffd2f 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am
@@ -21,7 +21,7 @@ $(PGM): $(OBJS)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 
-all-local: $(OBJS) $(PGM)
+all-local: $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am
index 1d2c61340f..92df750a9f 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am
@@ -15,16 +15,11 @@ OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
 
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+noinst_DATA = $(OBJS)
 
-$(PGM): $(OBJS)
-	$(make-rel)
+# the .o files built here will be put into libbsp.a by ../wrapup/Makefile
 
-# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
-
-all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM)
+all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = irq.c irq.h irq_asm.S irq_init.c
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am
index 87f1e360a3..98ab26d0da 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am
@@ -24,7 +24,7 @@ $(PGM): $(OBJS)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 
 if HAS_NETWORKING
-all-local: $(OBJS) $(PGM)
+all-local: $(PGM)
 endif
 
 .PRECIOUS: $(PGM)
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am
index 67650db071..24bd125edd 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am
@@ -2,22 +2,26 @@
 ## $Id$
 ##
 
-VPATH = @srcdir@:@srcdir@/../../../shared
-
 PGM = $(ARCH)/startup.rel
 
-C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \
-    setvec.c gnatinstallhandler.c cpuinit.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+C_FILES = bspstart.c cpuinit.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
 
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+shared_C_FILES = $(top_srcdir)/../../shared/bootcard.c
+shared_C_FILES += $(top_srcdir)/../../shared/bspclean.c
+shared_C_FILES += $(top_srcdir)/../../shared/bsplibc.c
+shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c
+shared_C_FILES += $(top_srcdir)/../../shared/main.c
+shared_C_FILES += $(top_srcdir)/../../shared/sbrk.c
+shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c
+OBJS += \
+    $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT))
+
+$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
 
 $(PGM): $(OBJS)
 	$(make-rel)
@@ -28,7 +32,7 @@ project_lib_DATA = linkcmds
 
 all-local: $(PGM) $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bspstart.c linkcmds setvec.c
+EXTRA_DIST = linkcmds $(C_FILES)
 
 $(PROJECT_LIB)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_LIB)