From 4906d72f85401eefbd214f7b124e85f972bb97cd Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 18 Jun 2001 17:02:30 +0000
Subject: 2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.in: Add bspopts.h.
	* include/.cvsignore: Add bspopts.h*, stamp-h*.
	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
	* include/bsp.h: Include bspopts.h.
---
 c/src/lib/libbsp/m68k/mvme167/ChangeLog            |  7 +++++
 c/src/lib/libbsp/m68k/mvme167/configure.in         |  1 +
 c/src/lib/libbsp/m68k/mvme167/include/.cvsignore   |  4 +++
 c/src/lib/libbsp/m68k/mvme167/include/Makefile.am  | 30 +++++-----------------
 c/src/lib/libbsp/m68k/mvme167/include/bsp.h        |  2 ++
 c/src/lib/libbsp/m68k/ods68302/ChangeLog           |  7 +++++
 c/src/lib/libbsp/m68k/ods68302/configure.in        |  1 +
 c/src/lib/libbsp/m68k/ods68302/include/.cvsignore  |  4 +++
 c/src/lib/libbsp/m68k/ods68302/include/Makefile.am | 27 +++----------------
 c/src/lib/libbsp/m68k/ods68302/include/bsp.h       |  2 ++
 c/src/lib/libbsp/m68k/sim68000/ChangeLog           |  7 +++++
 c/src/lib/libbsp/m68k/sim68000/configure.in        |  2 ++
 c/src/lib/libbsp/m68k/sim68000/include/.cvsignore  |  4 +++
 c/src/lib/libbsp/m68k/sim68000/include/Makefile.am | 18 ++++++-------
 c/src/lib/libbsp/m68k/sim68000/include/bsp.h       |  2 ++
 15 files changed, 63 insertions(+), 55 deletions(-)

(limited to 'c/src/lib/libbsp/m68k')

diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index 2e05d3d7ad..a203cad329 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Add bspopts.h.
+	* include/.cvsignore: Add bspopts.h*, stamp-h*.
+	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+	* include/bsp.h: Include bspopts.h.
+
 2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/m68k/mvme167/configure.in b/c/src/lib/libbsp/m68k/mvme167/configure.in
index fe3d658baa..6445fd0945 100644
--- a/c/src/lib/libbsp/m68k/mvme167/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme167/configure.in
@@ -22,6 +22,7 @@ RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore b/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am
index 691f3c4174..54521c75f1 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am
@@ -4,37 +4,21 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h coverhd.h $(srcdir)/../../mvme162/include/mvme16x_hw.h \
-    page_table.h fatal.h
+include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h fatal.h bspopts.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/fatal.h: fatal.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/mvme16x_hw.h: \
-    $(srcdir)/../../mvme162/include/mvme16x_hw.h
-	$(INSTALL_DATA) $< $@
+mvme16x_hw.h: $(srcdir)/../../mvme162/include/mvme16x_hw.h
+	cp $< $@
+CLEANFILES += mvme16x_hw.h
 
-$(PROJECT_INCLUDE)/page_table.h: page_table.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/fatal.h: fatal.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/mvme16x_hw.h \
-    $(PROJECT_INCLUDE)/page_table.h $(PROJECT_INCLUDE)/fatal.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h coverhd.h fatal.h page_table.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
index 1efd026213..e2f0db1eaf 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h
@@ -26,6 +26,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index 3fa8bcc000..3ea3860d56 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Add bspopts.h.
+	* include/.cvsignore: Add bspopts.h*, stamp-h*.
+	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+	* include/bsp.h: Include bspopts.h.
+
 2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/m68k/ods68302/configure.in b/c/src/lib/libbsp/m68k/ods68302/configure.in
index f919096190..1693e307b4 100644
--- a/c/src/lib/libbsp/m68k/ods68302/configure.in
+++ b/c/src/lib/libbsp/m68k/ods68302/configure.in
@@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore b/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am
index cddd8c5964..76b5ded379 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am
@@ -4,36 +4,17 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h
+include_HEADERS = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h bspopts.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bare.h: bare.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/crc.h: crc.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/debugport.h: debugport.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68302scc.h: m68302scc.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bare.h \
-    $(PROJECT_INCLUDE)/bsp.h $(PROJECT_INCLUDE)/coverhd.h \
-    $(PROJECT_INCLUDE)/crc.h $(PROJECT_INCLUDE)/debugport.h \
-    $(PROJECT_INCLUDE)/m68302scc.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADER:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
index 2dfa83119b..72f502ba61 100644
--- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h
@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <console.h>
 #include <iosupp.h>
diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
index d2d375db3a..a0eef986b4 100644
--- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog
+++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.in: Add bspopts.h.
+	* include/.cvsignore: Add bspopts.h*, stamp-h*.
+	* include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+	* include/bsp.h: Include bspopts.h.
+
 2001-05-10	Ralf Corsepius	<corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/m68k/sim68000/configure.in b/c/src/lib/libbsp/m68k/sim68000/configure.in
index 2ac19d1261..63a7ab72da 100644
--- a/c/src/lib/libbsp/m68k/sim68000/configure.in
+++ b/c/src/lib/libbsp/m68k/sim68000/configure.in
@@ -18,7 +18,9 @@ RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
+
 RTEMS_PROJECT_ROOT
+AM_CONFIG_HEADER(include/bspopts.h)
 
 # Explicitly list all Makefiles here
 AC_OUTPUT( 
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore b/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am
index 1d6c3074ec..e11e2d0f5e 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am
@@ -4,22 +4,22 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = bsp.h ../../../shared/include/coverhd.h
+include_HEADERS = bsp.h coverhd.h bspopts.h
+
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+	cp $< $@
+
+CLEANFILES += coverhd.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
 
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = bsp.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
index 818579e1c1..446f822ded 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <iosupp.h>
 #include <console.h>
-- 
cgit v1.2.3