2004-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Merge-in start/Makefile.am.
	* start/Makefile.am: Remove.
	* configure.ac: Reflect changes above.

4 files changed, 30 insertions, 12 deletions

diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
index 52a5d1b9e8..ddd21190d1 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
@@ -1,5 +1,11 @@
 2004-01-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* Makefile.am: Merge-in start/Makefile.am.
+	* start/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+
+2004-01-30	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* wrapup/Makefile.am: Reflect changes to
 	../support/*exception_processing/*.
 
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
index 48bed8780e..8c29328763 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
@@ -6,35 +6,50 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
 # from the individual .rel files built in other directories
-SUBDIRS = . clock console startup start timer scv64 tod sonic @exceptions@ \
-    wrapup
+SUBDIRS = . clock console startup timer scv64 tod sonic @exceptions@ wrapup
 
+include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
+EXTRA_PROGRAMS =
+CLEANFILES =
+noinst_DATA =
+
 include_HEADERS += include/dmv170.h
-nodist_include_HEADERS += $(top_srcdir)/../../shared/tod.h
-nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+nodist_include_HEADERS += ../../shared/tod.h
+nodist_include_HEADERS += ../../shared/include/coverhd.h
+
+EXTRA_DIST = start/start.S
+start$(LIB_VARIANT).$(OBJEXT): start/start.S
+	${CCASCOMPILE} -DASM -o $@ -c $<
+project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
 
-all-local: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
-EXTRA_DIST = QUIRKS README.net STATUS cable.doc times
+EXTRA_DIST += QUIRKS README.net STATUS cable.doc times
 
 PREINSTALL_DIRS =
+TMPINSTALL_FILES =
 
 $(PROJECT_INCLUDE)/dmv170.h: include/dmv170.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/dmv170.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/dmv170.h
 
-$(PROJECT_INCLUDE)/tod.h: $(top_srcdir)/../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
 
-$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
-CLEANFILES = $(PREINSTALL_FILES)
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
+CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.ac b/c/src/lib/libbsp/powerpc/dmv177/configure.ac
index 20395d1b53..9be7a64ceb 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac
+++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac
@@ -53,7 +53,6 @@ clock/Makefile
 console/Makefile
 scv64/Makefile
 sonic/Makefile
-start/Makefile
 startup/Makefile
 timer/Makefile
 tod/Makefile
diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore b/c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/c/src/lib/libbsp/powerpc/dmv177/start/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in