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-06-18 16:54:47 +00:00
parent 880e827b63
commit c4d9221625
30 changed files with 114 additions and 59 deletions
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/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]).
--- a/c/src/lib/libbsp/m68k/gen68360/configure.in
+++ b/c/src/lib/libbsp/m68k/gen68360/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
--- a/c/src/lib/libbsp/m68k/gen68360/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/gen68360/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
--- a/c/src/lib/libbsp/m68k/gen68360/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/include/Makefile.am
@@ -4,22 +4,17 @@

 AUTOMAKE_OPTIONS = foreign 1.4

-H_FILES = bsp.h coverhd.h
+include_HEADERS = bsp.h coverhd.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) $< $@
-
-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 coverhd.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
--- a/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68360/include/bsp.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif

+#include <bspopts.h>
+
 #include <rtems.h>
 #include <console.h>
 #include <iosupp.h>
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/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]).
--- a/c/src/lib/libbsp/m68k/idp/configure.in
+++ b/c/src/lib/libbsp/m68k/idp/configure.in
@@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CANONICAL_HOST

+AC_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT

 # Explicitly list all Makefiles here
--- a/c/src/lib/libbsp/m68k/idp/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/idp/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
--- a/c/src/lib/libbsp/m68k/idp/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/idp/include/Makefile.am
@@ -4,25 +4,20 @@

 AUTOMAKE_OPTIONS = foreign 1.4

-H_FILES = bsp.h ../../../shared/include/coverhd.h leds.h
+include_HEADERS = bsp.h coverhd.h leds.h bspopts.h
+
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+	cp $< $@
+CLEANFILES += coverhd.h

 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $< $@

-$(PROJECT_INCLUDE)/bsp.h: bsp.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/leds.h: leds.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/leds.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)

 all-local: $(TMPINSTALL_FILES)

-EXTRA_DIST = README bsp.h leds.h
+EXTRA_DIST = README

 include $(top_srcdir)/../../../../../../automake/local.am
--- a/c/src/lib/libbsp/m68k/idp/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/idp/include/bsp.h
@@ -8,6 +8,8 @@
 #ifndef __IDP_BSP_H
 #define __IDP_BSP_H

+#include <bspopts.h>
+
 #include <rtems.h>
 #include <console.h>
 #include <clockdrv.h>
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/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-25	Joel Sherrill <joel@OARcorp.com>

 	* clock/Makefile.am, console/Makefile.am, spurious/Makefile.am,
--- a/c/src/lib/libbsp/m68k/mrm332/configure.in
+++ b/c/src/lib/libbsp/m68k/mrm332/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
--- a/c/src/lib/libbsp/m68k/mrm332/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mrm332/include/.cvsignore
@@ -1,2 +1,7 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+coverhd.h
+stamp-h
+stamp-h.in
--- a/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am
@@ -4,25 +4,20 @@

 AUTOMAKE_OPTIONS = foreign 1.4

-H_FILES = bsp.h ../../../shared/include/coverhd.h mrm332.h
+include_HEADERS = bsp.h coverhd.h mrm332.h bspopts.h

 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@

-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@

-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
 	$(INSTALL_DATA) $< $@

-$(PROJECT_INCLUDE)/mrm332.h: mrm332.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
-    $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/mrm332.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)

 all-local: $(TMPINSTALL_FILES)

-EXTRA_DIST = bsp.h mrm332.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -19,6 +19,8 @@
 extern "C" {
 #endif

+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/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]).
--- a/c/src/lib/libbsp/m68k/mvme136/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme136/configure.in
@@ -22,6 +22,7 @@ RTEMS_CANONICAL_HOST

 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT

 # Explicitly list all Makefiles here
--- a/c/src/lib/libbsp/m68k/mvme136/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mvme136/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
--- a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am
@@ -4,22 +4,17 @@

 AUTOMAKE_OPTIONS = foreign 1.4

-H_FILES = bsp.h coverhd.h
+include_HEADERS = bsp.h coverhd.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) $< $@
-
-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 coverhd.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
@@ -19,6 +19,8 @@
 extern "C" {
 #endif

+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/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]).
--- a/c/src/lib/libbsp/m68k/mvme147/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme147/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
--- a/c/src/lib/libbsp/m68k/mvme147/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mvme147/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
--- a/c/src/lib/libbsp/m68k/mvme147/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/include/Makefile.am
@@ -4,22 +4,17 @@

 AUTOMAKE_OPTIONS = foreign 1.4

-H_FILES = bsp.h coverhd.h
+include_HEADERS = bsp.h coverhd.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) $< $@
-
-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 coverhd.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
@@ -23,6 +23,8 @@
 extern "C" {
 #endif

+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>
--- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147s/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]).
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.in
@@ -22,6 +22,7 @@ RTEMS_CANONICAL_HOST

 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")

+AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT

 # Explicitly list all Makefiles here
--- a/c/src/lib/libbsp/m68k/mvme147s/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/mvme147s/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
--- a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am
@@ -4,22 +4,17 @@

 AUTOMAKE_OPTIONS = foreign 1.4

-H_FILES = bsp.h coverhd.h
+include_HEADERS = bsp.h coverhd.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) $< $@
-
-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 coverhd.h
-
 include $(top_srcdir)/../../../../../../automake/local.am
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
@@ -23,6 +23,8 @@
 extern "C" {
 #endif

+#include <bspopts.h>
+
 #include <rtems.h>
 #include <clockdrv.h>
 #include <console.h>