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.

21 files changed, 121 insertions, 150 deletions

diff --git a/c/src/lib/libbsp/bare/ChangeLog b/c/src/lib/libbsp/bare/ChangeLog
index 75edad1f6c..61d1104c7b 100644
--- a/c/src/lib/libbsp/bare/ChangeLog
+++ b/c/src/lib/libbsp/bare/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>
 
 	* include/bsp.h: URL for license changed.
diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am
index a0b8915e26..70be864415 100644
--- a/c/src/lib/libbsp/bare/Makefile.am
+++ b/c/src/lib/libbsp/bare/Makefile.am
@@ -6,9 +6,14 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 
 include $(top_srcdir)/../bsp.am
 
-SUBDIRS = . include
+nodist_include_HEADERS += $(top_srcdir)/../shared/include/coverhd.h
 
-EXTRA_DIST = bsp_specs build-tools do-bare-bsp-build
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = build-tools do-bare-bsp-build
+
+$(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/bare/configure.ac b/c/src/lib/libbsp/bare/configure.ac
index 188739d5f4..72dff4bae2 100644
--- a/c/src/lib/libbsp/bare/configure.ac
+++ b/c/src/lib/libbsp/bare/configure.ac
@@ -19,6 +19,5 @@ AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-include/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/bare/include/Makefile.am b/c/src/lib/libbsp/bare/include/Makefile.am
deleted file mode 100644
index 88725917ef..0000000000
--- a/c/src/lib/libbsp/bare/include/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h coverhd.h bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-coverhd.h: $(top_srcdir)/../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/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 96191f172e..1c016f0438 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,3 +1,14 @@
+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-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* bsp_specs: Remove *lib:.
+
 2003-09-04	Joel Sherrill <joel@OARcorp.com>
 
 	* clock/clock.c, console/console.c, console/consolereserveresources.c,
diff --git a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
index f77ab70c74..3484731e2c 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am
@@ -5,12 +5,25 @@
 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 = . start include startup console clock timer wrapup tools
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup console clock timer wrapup tools
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs times
+include_HEADERS += include/simio.h
+nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = times
+
+$(PROJECT_INCLUDE)/simio.h: include/simio.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/simio.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/c4x/c4xsim/bsp_specs b/c/src/lib/libbsp/c4x/c4xsim/bsp_specs
index 807fba5c70..de8ff74885 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/bsp_specs
+++ b/c/src/lib/libbsp/c4x/c4xsim/bsp_specs
@@ -1,15 +1,7 @@
-%rename lib old_lib
 %rename endfile old_endfile
 %rename startfile old_startfile
 %rename link old_link
 
-
-*lib:
-%{!qrtems: %(old_lib)} %{!nostdlib: %{qrtems: --start-group \
-%{!qrtems_debug: -lrtemsbsp -lrtemscpu} %{qrtems_debug: -lrtemsbsp_g -lrtemscpu_g} \
--lc -lgcc --end-group \
-%{!qnolinkcmds: -T linkcmds%s}}}
-
 *startfile:
 %{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: \
 %{!qrtems_debug: start.o%s} \
diff --git a/c/src/lib/libbsp/c4x/c4xsim/configure.ac b/c/src/lib/libbsp/c4x/c4xsim/configure.ac
index 81a27897f7..902f2f9e12 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/configure.ac
+++ b/c/src/lib/libbsp/c4x/c4xsim/configure.ac
@@ -20,7 +20,6 @@ RTEMS_CONFIG_BUILD_SUBDIRS(tools)
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 start/Makefile
 startup/Makefile
 timer/Makefile
diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
deleted file mode 100644
index 211d42d09c..0000000000
--- a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## $Id$
-##
-
-
-include_HEADERS = bsp.h simio.h bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
-	cp $< $@
-CLEANFILES = coverhd.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index b1c2603218..a384c28962 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/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-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am
index 31ff58222c..e7f1014cbf 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am
@@ -5,12 +5,18 @@
 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 timer network wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . start startup clock console timer network wrapup
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+$(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/i386/i386ex/configure.ac b/c/src/lib/libbsp/i386/i386ex/configure.ac
index bc835d4b19..af24251945 100644
--- a/c/src/lib/libbsp/i386/i386ex/configure.ac
+++ b/c/src/lib/libbsp/i386/i386ex/configure.ac
@@ -27,7 +27,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 start/Makefile
 startup/Makefile
 timer/Makefile
diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am
deleted file mode 100644
index 3211a07f19..0000000000
--- a/c/src/lib/libbsp/i386/i386ex/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) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 138fc4f1b4..b9d124e025 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/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-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 2784052e50..b9518547a7 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -5,9 +5,9 @@
 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 tools start startup clock console timer ne2000 wd8003 \
-    3c509 ide wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . tools start startup clock console timer ne2000 wd8003 3c509 ide \
+    wrapup
 
 include $(top_srcdir)/../../bsp.am
 
@@ -16,7 +16,32 @@ $(PROJECT_RELEASE)/BootImgs:
 
 TMPINSTALL_FILES = $(PROJECT_RELEASE)/BootImgs
 
-EXTRA_DIST = HOWTO README.dec21140 STATUS bsp_specs times_i486dx times_p5
+# This driver needs to be reworked for the BSD stack.
+# We only install wd80x3.h if HAS_NETWORKING was defined
+if HAS_NETWORKING
+include_HEADERS += include/wd80x3.h
+endif
+
+include_HEADERS += include/crt.h
+nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = HOWTO README.dec21140 STATUS times_i486dx times_p5
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
+endif
+
+$(PROJECT_INCLUDE)/crt.h: include/crt.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.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/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac
index 184be2a2e9..6467145531 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/configure.ac
@@ -30,7 +30,6 @@ AC_SUBST(RTEMS_BSP)
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 start/Makefile
 startup/Makefile
 timer/Makefile
diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.am b/c/src/lib/libbsp/i386/pc386/include/Makefile.am
deleted file mode 100644
index 286070063b..0000000000
--- a/c/src/lib/libbsp/i386/pc386/include/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-## $Id$
-##
-
-
-# This driver needs to be reworked for the BSD stack.
-# We only install wd80x3.h if HAS_NETWORKING was defined
-if HAS_NETWORKING
-WD80X3 = wd80x3.h
-endif
-
-include_HEADERS = bsp.h crt.h coverhd.h $(WD80X3) bspopts.h
-
-coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
-	cp $< $@
-CLEANFILES = coverhd.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = wd80x3.h
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 1251dc8580..f9212911b7 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/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-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bsp_specs: Remove *lib:.
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index 96eb812f27..a84e55c117 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -5,12 +5,28 @@
 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 tools start startup clock console timer network wrapup
+# from the individual .rel files built in other directories
+SUBDIRS = . tools start startup clock console timer network wrapup
 
 include $(top_srcdir)/../../bsp.am
 
-EXTRA_DIST = bsp_specs
+if HAS_NETWORKING
+include_HEADERS += include/wd80x3.h
+endif
+
+include_HEADERS += include/coverhd.h
+
+all-local: $(PREINSTALL_FILES)
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
+endif
+
+$(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/i386/ts_386ex/configure.ac b/c/src/lib/libbsp/i386/ts_386ex/configure.ac
index 5c4f9da87d..fe2d2be176 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.ac
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.ac
@@ -43,7 +43,6 @@ RTEMS_BSPOPTS_HELP([UARTDEBUG],
 AC_CONFIG_FILES([Makefile
 clock/Makefile
 console/Makefile
-include/Makefile
 start/Makefile
 startup/Makefile
 timer/Makefile
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am
deleted file mode 100644
index 2f1a040dd3..0000000000
--- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## $Id$
-##
-
-
-if HAS_NETWORKING
-NETWORK_H_FILES = wd80x3.h
-endif
-
-include_HEADERS = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES) bspopts.h
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = wd80x3.h
-
-include $(top_srcdir)/../../../../automake/local.am