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

	* bootloader/Makefile.am: Misc cleanups and fixes.
	* motorola/Makefile.am: Misc cleanups and fixes.
	* start/Makefile.am: Misc cleanups and fixes.
	* startup/Makefile.am: Misc cleanups and fixes.
	* startup/linkcmds: Preparations for gcc-3.3.x.

6 files changed, 41 insertions, 37 deletions

diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index bf3443b970..4d20620a70 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bootloader/Makefile.am: Misc cleanups and fixes.
+	* motorola/Makefile.am: Misc cleanups and fixes.
+	* start/Makefile.am: Misc cleanups and fixes.
+	* startup/Makefile.am: Misc cleanups and fixes.
+	* startup/linkcmds: Preparations for gcc-3.3.x.
+
 2003-12-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Cosmetics.
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index 4c4ff9b29d..ab1d79c4f6 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -47,20 +47,24 @@ bootloader$(EXEEXT): $(bootloader_OBJECTS)
 bootloader.$(OBJEXT): bootloader$(EXEEXT)
 	cp $< $@
 
-ppcbootdir = $(bsplibdir)
-ppcboot_DATA = bootloader.$(OBJEXT)
-ppcboot_DATA += ../../shared/bootloader/ppcboot.lds
+project_lib_DATA = bootloader.$(OBJEXT)
+project_lib_DATA += ../../shared/bootloader/ppcboot.lds
 
 # FIXME: Tmp-install stuff to make mcp750.cfg's make-exe happy.
 # As mcp750.cfg's make-exe doesn't work outside of the source-tree.
 # We might consider to use this directory directly for in-source-tree
 # building, instead.
-$(PROJECT_RELEASE)/lib/%: %
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib/bootloader.$(OBJEXT) \
-    $(PROJECT_RELEASE)/lib/ppcboot.lds
 
 all-local: $(TMPINSTALL_FILES)
 
+TMPINSTALL_FILES =
+
+${PROJECT_RELEASE}/lib/bootloader.$(OBJEXT): bootloader.$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/bootloader.$(OBJEXT)
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/bootloader.$(OBJEXT)
+
+${PROJECT_RELEASE}/lib/ppcboot.lds: ../../shared/bootloader/ppcboot.lds ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/ppcboot.lds
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/ppcboot.lds
+
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
index ed651520d2..96ae5d2ceb 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
@@ -24,9 +24,6 @@ include $(top_srcdir)/../../../../automake/lib.am
 
 all-local: $(OBJS)
 
-    $(top_srcdir)/../shared/motorola/motorola.h
-	$(INSTALL_DATA) $< $@
-
 PREINSTALL_FILES =
 
 $(PROJECT_INCLUDE)/bsp/$(dirstamp):
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
index c2e679739f..627204b128 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
@@ -11,26 +11,22 @@ OBJS = $(S_O_FILES)
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
+include $(top_srcdir)/../../bspstart.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
-bsplib_DATA = $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT)
-bsplib_DATA += $(PROJECT_RELEASE)/lib/rtems_crti.$(OBJEXT)
+project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+project_lib_DATA += $(ARCH)/rtems_crti$(LIB_VARIANT).$(OBJEXT)
 
-$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT)
-	$(INSTALL_DATA) $< $@
+all-local: $(TMPINSTALL_FILES)
 
-$(PROJECT_RELEASE)/lib/rtems_crti.$(OBJEXT): $(ARCH)/rtems_crti.$(OBJEXT)
-	$(INSTALL_DATA) $< $@
+${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT)
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems_crti.$(OBJEXT)
-
-all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(ARCH)/rtems_crti.$(OBJEXT) $(TMPINSTALL_FILES)
-
-$(OBJS): $(ARCH)
-
-.PRECIOUS: $(ARCH)/start.$(OBJEXT) $(ARCH)/rtems_crti.$(OBJEXT)
+${PROJECT_RELEASE}/lib/rtems_crti$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rtems_crti$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/rtems_crti$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/rtems_crti$(LIB_VARIANT).$(OBJEXT)
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
index c544fe8b6f..742c62fe8a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
@@ -4,6 +4,8 @@
 
 VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/startup:@srcdir@/../../../shared
 
+PGM = $(ARCH)/startup.rel
+
 C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.c \
     gnatinstallhandler.c pgtbl_setup.c pgtbl_activate.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -17,19 +19,17 @@ include $(top_srcdir)/../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-bsplib_DATA = linkcmds
-
-$(PROJECT_RELEASE)/lib/linkcmds: linkcmds
-	$(INSTALL_DATA) $< $@
+$(PGM): $(OBJS)
+	$(make-rel)
 
-# FIXME: This should not be here
-# $(PROJECT_RELEASE)/lib/libbsp.a:
-#	cd ../wrapup; $(MAKE) $(AM_MAKEFLAGS)
+project_lib_DATA = linkcmds
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
-
-all-local: $(OBJS) $(TMPINSTALL_FILES)
+all-local: $(PGM) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = linkcmds
 
+${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp)
+	$(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds
+TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds
+
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds
index 0e88c3664e..a8d103c7e0 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds
@@ -131,8 +131,7 @@ _SDA2_BASE_ = __SDATA2_START__ + 0x8000;
     *       an invalid mapping may result!!!
     */
 	PROVIDE(__DATA_START__ = ABSOLUTE(.) );
-    *(.data)
-    *(.gnu.linkonce.d*)	
+    *(.data .data.* .gnu.linkonce.d*)	
     SORT(CONSTRUCTORS)
   } > CODE
   .data1   : { *(.data1) }	> CODE