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

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

4 files changed, 24 insertions, 34 deletions

diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog
index e43bedd721..6b250e86f0 100644
--- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-07	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* start/Makefile.am: Remove.
+	* Makefile.am: Merge-in start/Makefile.am.
+	* configure.ac: Reflect changes above.
+
 2004-01-05	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* wrapup/Makefile.am: Eliminate $(LIB). 
diff --git a/c/src/lib/libbsp/m68k/efi68k/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/Makefile.am
index 40f9c86aa4..da789eb2a7 100644
--- a/c/src/lib/libbsp/m68k/efi68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/efi68k/Makefile.am
@@ -4,21 +4,30 @@
 
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../bsp.am
+
 # wrapup is the one that actually builds and installs the library
 # from the individual .rel files built in other directories
-SUBDIRS = . start startup clock console spurious timer wrapup
-
-include $(top_srcdir)/../../bsp.am
+SUBDIRS = . startup clock console spurious timer wrapup
 
 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
 include_HEADERS += include/efi68k.h
 include_HEADERS += include/16550.h
 include_HEADERS += include/DP8570A.h
 
-all-local: $(PREINSTALL_FILES)
-
 EXTRA_DIST = times
 
+C_FILES = start/start.C
+$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.c $(ARCH)/$(dirstamp)
+	$(COMPILE) -o $@ -c $<
+
+project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
+
+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+
 $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
@@ -35,5 +44,9 @@ $(PROJECT_INCLUDE)/DP8570A.h: include/DP8570A.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/DP8570A.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/DP8570A.h
 
+$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/efi68k/configure.ac b/c/src/lib/libbsp/m68k/efi68k/configure.ac
index c8706fd025..d59eb47c3f 100644
--- a/c/src/lib/libbsp/m68k/efi68k/configure.ac
+++ b/c/src/lib/libbsp/m68k/efi68k/configure.ac
@@ -19,7 +19,6 @@ AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
 spurious/Makefile
-start/Makefile
 startup/Makefile
 timer/Makefile
 wrapup/Makefile])
diff --git a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am
deleted file mode 100644
index 2c13e02cc6..0000000000
--- a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## $Id$
-##
-
-C_FILES = start.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-include $(top_srcdir)/../../../../automake/compile.am
-include $(top_srcdir)/../../../../automake/lib.am
-include $(top_srcdir)/../../bspstart.am
-
-project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = start.c
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-
-include $(top_srcdir)/../../../../automake/local.am