1 files changed, 16 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
index ee6ad64d80..f775d49c64 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
@@ -2,7 +2,7 @@
 ## $Id$
 ##
 
-VPATH = @srcdir@:@srcdir@/../../../shared
+
 
 PGM = $(ARCH)/startup.rel
 
@@ -12,19 +12,24 @@ PGM = $(ARCH)/startup.rel
 #       Generation 2 --> FPGA
 STARTUP_C_FILES = FPGA.c
 
-C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \
-    setvec.c Hwr_init.c spurious.c genpvec.c $(STARTUP_C_FILES) \
-    gnatinstallhandler.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
+C_FILES = bspclean.c bspstart.c \
+    setvec.c Hwr_init.c spurious.c genpvec.c $(STARTUP_C_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 +=
-#
+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))
+
+$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+
 
 $(PGM): $(OBJS)
 	$(make-rel)
@@ -33,8 +38,7 @@ project_lib_DATA = linkcmds
 
 all-local: $(PGM) $(TMPINSTALL_FILES)
 
-EXTRA_DIST = FPGA.c Hwr_init.c bspclean.c bspstart.c genpvec.c linkcmds \
-    setvec.c spurious.c vmeintr.c
+EXTRA_DIST = $(C_FILES) linkcmds
 
 $(PROJECT_LIB)/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_LIB)