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.

19 files changed, 111 insertions, 104 deletions

diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
index e820e9ea39..baf6fe042f 100644
--- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog
+++ b/c/src/lib/libbsp/m68k/dmv152/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-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/Makefile.am
index 97b2304596..4af04fef0a 100644
--- a/c/src/lib/libbsp/m68k/dmv152/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.am
@@ -5,12 +5,20 @@
 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 clock console spurious timer wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup clock console spurious timer wrapup
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(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/m68k/dmv152/configure.ac b/c/src/lib/libbsp/m68k/dmv152/configure.ac
index 64e9708547..85346ae343 100644
--- a/c/src/lib/libbsp/m68k/dmv152/configure.ac
+++ b/c/src/lib/libbsp/m68k/dmv152/configure.ac
@@ -28,7 +28,6 @@ RTEMS_BSPOPTS_HELP([USE_CHANNEL_B],
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 spurious/Makefile
 start/Makefile
 startup/Makefile
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
deleted file mode 100644
index ee2cf9a04b..0000000000
--- a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog
index c26776c017..e6da7197d4 100644
--- a/c/src/lib/libbsp/m68k/efi332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi332/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-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/m68k/efi332/Makefile.am b/c/src/lib/libbsp/m68k/efi332/Makefile.am
index 97b2304596..1c5058bfc1 100644
--- a/c/src/lib/libbsp/m68k/efi332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/efi332/Makefile.am
@@ -5,12 +5,26 @@
 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 clock console spurious timer wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup clock console spurious timer wrapup
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/efi332.h
+
+nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(PROJECT_INCLUDE)/efi332.h: include/efi332.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/efi332.h
+
+$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/m68k/efi332/configure.ac b/c/src/lib/libbsp/m68k/efi332/configure.ac
index 3d0fe7f6b1..1471cc8f76 100644
--- a/c/src/lib/libbsp/m68k/efi332/configure.ac
+++ b/c/src/lib/libbsp/m68k/efi332/configure.ac
@@ -14,13 +14,10 @@ RTEMS_BSP_CONFIGURE
 RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
 RTEMS_CANONICALIZE_TOOLS
 
-
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 spurious/Makefile
 start/Makefile
 startup/Makefile
diff --git a/c/src/lib/libbsp/m68k/efi332/include/Makefile.am b/c/src/lib/libbsp/m68k/efi332/include/Makefile.am
deleted file mode 100644
index 39009fa0aa..0000000000
--- a/c/src/lib/libbsp/m68k/efi332/include/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h efi332.h bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-coverhd.h: ../../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
-CLEANFILES = coverhd.h
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index c7c2a6cf88..e8b8b4bdf2 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -5,7 +5,7 @@
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
+# from the individual .rel files built in other directories
 SUBDIRS = . start startup clock console spurious timer wrapup
 
 include $(top_srcdir)/../../bsp.am
@@ -17,5 +17,13 @@ all-local: $(PREIINSTALL_FILES)
 
 EXTRA_DIST = times
 
+$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h
+
+$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 6c0f6227f1..2d9bef2ce9 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/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-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am
index 9f515c0cdd..20499c1135 100644
--- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am
@@ -5,12 +5,20 @@
 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 clock console shmsupp timer wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup clock console shmsupp timer wrapup
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(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/m68k/mvme136/configure.ac b/c/src/lib/libbsp/m68k/mvme136/configure.ac
index 7f7790c0b8..d31103956d 100644
--- a/c/src/lib/libbsp/m68k/mvme136/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme136/configure.ac
@@ -18,12 +18,10 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 shmsupp/Makefile
 start/Makefile
 startup/Makefile
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am
deleted file mode 100644
index ee2cf9a04b..0000000000
--- a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index 2f83b3e62e..4f0aa9447d 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -5,7 +5,7 @@
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
+# from the individual .rel files built in other directories
 SUBDIRS = . start startup clock console timer wrapup
 
 include $(top_srcdir)/../../bsp.am
@@ -16,5 +16,9 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = times
 
+$(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/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index e600576604..00c9238592 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -9,11 +9,11 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 # The MVME162 has 2 z8530's to yield four serial ports.
 # The application can access these by referencing the consolex driver
 # with "CONSOLEX_DRIVER_TABLE_ENTRY" in the driver table definition,
-# in place of "CONSOLE_DRIVER_TABLE_ENTRY".  See consolex/cTest.c for
+# in place of "CONSOLE_DRIVER_TABLE_ENTRY". See consolex/cTest.c for
 # an example.
 
 # wrapup is the one that actually builds and installs the library
-#  from the individual .rel files built in other directories
+# from the individual .rel files built in other directories
 SUBDIRS = . start startup clock console timer tod network wrapup tools
 
 include $(top_srcdir)/../../bsp.am
@@ -28,5 +28,22 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = times
 
+$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
+
+$(PROJECT_INCLUDE)/page_table.h: include/page_table.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
+
+$(PROJECT_INCLUDE)/tod.h: include/tod.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
+
+$(PROJECT_INCLUDE)/mvme16x_hw.h: \
+    $(top_srcdir)/../shared/mvme/include/mvme16x_hw.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
+
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
index dbb9f4ce12..74030979ef 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog
+++ b/c/src/lib/libbsp/mips64orion/p4000/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>
 
 	* console/console.c, include/bsp.h, include/coverhd.h,
diff --git a/c/src/lib/libbsp/mips64orion/p4000/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/Makefile.am
index 2d93f819b8..22ebbab452 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/Makefile.am
+++ b/c/src/lib/libbsp/mips64orion/p4000/Makefile.am
@@ -5,12 +5,20 @@
 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 liblnk wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup console liblnk wrapup
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(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/mips64orion/p4000/configure.ac b/c/src/lib/libbsp/mips64orion/p4000/configure.ac
index 342e6215de..73d7131e4a 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/configure.ac
+++ b/c/src/lib/libbsp/mips64orion/p4000/configure.ac
@@ -14,12 +14,9 @@ RTEMS_BSP_CONFIGURE
 RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
 RTEMS_CANONICALIZE_TOOLS
 
-
-
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 console/Makefile
-include/Makefile
 liblnk/Makefile
 start/Makefile
 startup/Makefile
diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am
deleted file mode 100644
index abbccfd9f7..0000000000
--- a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(TMPINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am