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

	* clock/Makefile.am: Eliminate VPATH.
	* console/Makefile.am: Eliminate VPATH.
	* network/Makefile.am: Eliminate VPATH.
	* nvram/Makefile.am: Eliminate VPATH.
	* pci/Makefile.am: Eliminate VPATH.
	* start/Makefile.am: Eliminate VPATH.
	* startup/Makefile.am: Eliminate VPATH.
	* timer/Makefile.am: Eliminate VPATH.
	* tod/Makefile.am: Eliminate VPATH.
	* universe/Makefile.am: Eliminate VPATH.
	* vectors/Makefile.am: Eliminate VPATH.

12 files changed, 38 insertions, 33 deletions

diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
index 4adc0a7555..103e16af15 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
@@ -1,3 +1,17 @@
+2003-12-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* clock/Makefile.am: Eliminate VPATH.
+	* console/Makefile.am: Eliminate VPATH.
+	* network/Makefile.am: Eliminate VPATH.
+	* nvram/Makefile.am: Eliminate VPATH.
+	* pci/Makefile.am: Eliminate VPATH.
+	* start/Makefile.am: Eliminate VPATH.
+	* startup/Makefile.am: Eliminate VPATH.
+	* timer/Makefile.am: Eliminate VPATH.
+	* tod/Makefile.am: Eliminate VPATH.
+	* universe/Makefile.am: Eliminate VPATH.
+	* vectors/Makefile.am: Eliminate VPATH.
+
 2003-12-13	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am
index 29e4a74073..bcd1265b8a 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/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/ppcn_60x/console/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am
index eaa484cb8e..1057568062 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/ppcn_60x/network/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am
index 2d0d171e93..d5da6dfe72 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am
@@ -22,7 +22,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/ppcn_60x/nvram/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am
index b1dec393fa..608cb17e98 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/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/ppcn_60x/pci/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am
index 3dceedc23e..7e34743cb4 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/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/ppcn_60x/start/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am
index 01a0f84051..660f0fdf07 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am
@@ -3,18 +3,12 @@
 ##
 
 S_FILES = start.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(S_O_FILES)
+OBJS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
 include $(top_srcdir)/../../bspstart.am
 
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
 project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
 
 all-local: $(TMPINSTALL_FILES)
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am
index fd84dabe88..7a2a826774 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am
@@ -2,31 +2,29 @@
 ## $Id$
 ##
 
-VPATH = @srcdir@:@srcdir@/../../../shared
+
 
 PGM = $(ARCH)/startup.rel
 
-C_FILES = bspstart.c bspclean.c sbrk.c setvec.c spurious.c genpvec.c swap.c \
-    main.c bootcard.c bsplibc.c bsppost.c gnatinstallhandler.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+C_FILES = bspstart.c bspclean.c setvec.c spurious.c genpvec.c swap.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 S_FILES = bsptrap.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
 
-#FIXME: What is this?
-# Files expected to be from the shared directory:
-#  sbrk bootcard main bsplibc bsppost
-STARTUP_C_PIECES = bspstart bspclean sbrk setvec spurious genpvec swap main \
-    bootcard bsplibc bsppost
+shared_C_FILES = $(top_srcdir)/../../shared/bootcard.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))
 
-#
-# (OPTIONAL) Add local stuff here using +=
-#
+$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
 
 $(PGM): $(OBJS)
 	$(make-rel)
@@ -35,8 +33,7 @@ project_lib_DATA = linkcmds
 
 all-local: $(PGM) $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bspclean.c bspstart.c bsptrap.S genpvec.c linkcmds \
-    rtems-ctor.cc setvec.c spurious.c swap.c
+EXTRA_DIST = linkcmds $(C_FILES) $(S_FILES)
 
 $(PROJECT_LIB)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_LIB)
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am
index 89cd2f36f3..2222cfc1af 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/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/ppcn_60x/tod/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am
index ab91001446..c27ef6ab1c 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/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/ppcn_60x/universe/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am
index b04ffe8e46..ce28290fdd 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/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/ppcn_60x/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am
index 1dbcfb7a54..bef3927b91 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/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)