4 files changed, 26 insertions, 21 deletions
diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index fb8fc25724..d81a3117f7 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-29	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Merge-in include/Makefile.am.
+	Reflect changes to bsp.am.
+	* include/Makefile.am: Remove.
+	* configure.ac: Reflect changes above.
+
 2003-09-04	Joel Sherrill <joel@OARcorp.com>
 
 	* clock/ckinit.c, console/console.c, include/bsp.h, include/coverhd.h,
diff --git a/c/src/lib/libbsp/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am
index 0318484218..e12322462e 100644
--- a/c/src/lib/libbsp/sh/simsh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/Makefile.am
@@ -5,8 +5,8 @@
 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 = include start startup console clock timer wrapup
+## from the individual .rel files built in other directories
+SUBDIRS = . start startup console clock timer wrapup
 SUBDIRS += tools
 
 # FIXME: This directory is missing
@@ -14,7 +14,23 @@ SUBDIRS += tools
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs
+include_HEADERS += include/syscall.h
+include_HEADERS += include/ramdisk.h
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+$(PROJECT_INCLUDE)/syscall.h: include/syscall.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/syscall.h
+
+$(PROJECT_INCLUDE)/ramdisk.h: include/ramdisk.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ramdisk.h
+
+$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/simsh4/configure.ac b/c/src/lib/libbsp/sh/simsh4/configure.ac
index 8d7b1ca3af..a58a088409 100644
--- a/c/src/lib/libbsp/sh/simsh4/configure.ac
+++ b/c/src/lib/libbsp/sh/simsh4/configure.ac
@@ -33,12 +33,9 @@ AC_DEFINE_UNQUOTED(
   [$START_HW_INIT],
   [Whether to call early_hw_init from start.S])
 
-
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 console/Makefile
-include/Makefile
 start/Makefile
 startup/Makefile
 clock/Makefile
diff --git a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am b/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
deleted file mode 100644
index 5363083e88..0000000000
--- a/c/src/lib/libbsp/sh/simsh4/include/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h bspopts.h coverhd.h syscall.h ramdisk.h
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(include_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am