summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-06-14 12:43:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-06-14 12:43:18 +0000
commitebf3adc76f5b79d58191185440d843d72376b013 (patch)
tree3412390a7614461e00a8325f250f31d75c9a5330 /c/src/lib/libbsp
parentdd406cb311dcef9369d97302e4029fc1ea27d4a5 (diff)
downloadrtems-ebf3adc76f5b79d58191185440d843d72376b013.tar.bz2
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.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/ChangeLog7
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/configure.in1
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am6
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am2
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/configure.in1
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/include/Makefile.am13
-rw-r--r--c/src/lib/libbsp/m68k/dmv152/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/efi332/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/efi332/configure.in1
-rw-r--r--c/src/lib/libbsp/m68k/efi332/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/m68k/efi332/include/Makefile.am16
-rw-r--r--c/src/lib/libbsp/m68k/efi332/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/configure.in1
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/include/Makefile.am24
-rw-r--r--c/src/lib/libbsp/m68k/efi68k/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/configure.in1
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/include/Makefile.am16
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/ChangeLog7
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/configure.in1
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/include/Makefile.am30
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/include/bsp.h2
31 files changed, 115 insertions, 76 deletions
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index acf5bd39ae..cdea2a486b 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/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/i386/ts_386ex/configure.in b/c/src/lib/libbsp/i386/ts_386ex/configure.in
index 43b6fed1d7..71098f3cf0 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in
@@ -28,6 +28,7 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
RTEMS_CONFIG_BUILD_SUBDIRS(tools)
+AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/.cvsignore
+++ b/c/src/lib/libbsp/i386/ts_386ex/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/i386/ts_386ex/include/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am
index ef1a5dcf9d..43793ba5b8 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am
@@ -8,7 +8,7 @@ if HAS_NETWORKING
NETWORK_H_FILES = wd80x3.h
endif
-H_FILES = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES)
+include_HEADERS = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES) bspopts.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -16,10 +16,10 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
-EXTRA_DIST = bsp.h coverhd.h wd80x3.h
+EXTRA_DIST = wd80x3.h
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
index 6baf0f12ba..104dd8d2bc 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
@@ -19,6 +19,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <iosupp.h>
#include <console.h>
diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am
index 960e3acaa6..36bd55cd4d 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am
@@ -11,7 +11,7 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
OBJS = $(S_O_FILES)
-H_FILES = 80386ex.h
+noinst_FILES = 80386ex.h
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/compile.am
diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog
index bc16ae16e4..1bcc2baef3 100644
--- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog
+++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/configure.in b/c/src/lib/libbsp/m68k/dmv152/configure.in
index 8fa8ecd95f..a22a5d85a0 100644
--- a/c/src/lib/libbsp/m68k/dmv152/configure.in
+++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/include/.cvsignore b/c/src/lib/libbsp/m68k/dmv152/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/include/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
index 2b8181354c..a2785f9a65 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/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
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
index bfb1f4d2d9..2d7725081d 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
@@ -19,6 +19,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <console.h>
#include <clockdrv.h>
diff --git a/c/src/lib/libbsp/m68k/efi332/ChangeLog b/c/src/lib/libbsp/m68k/efi332/ChangeLog
index 43f2c3c28b..83a3f7381f 100644
--- a/c/src/lib/libbsp/m68k/efi332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi332/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/efi332/configure.in b/c/src/lib/libbsp/m68k/efi332/configure.in
index 991a062ce0..996624df4d 100644
--- a/c/src/lib/libbsp/m68k/efi332/configure.in
+++ b/c/src/lib/libbsp/m68k/efi332/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/efi332/include/.cvsignore b/c/src/lib/libbsp/m68k/efi332/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/efi332/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/efi332/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/efi332/include/Makefile.am b/c/src/lib/libbsp/m68k/efi332/include/Makefile.am
index 550d392e01..77c7171d29 100644
--- a/c/src/lib/libbsp/m68k/efi332/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/efi332/include/Makefile.am
@@ -4,25 +4,21 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/coverhd.h efi332.h
+include_HEADERS = bsp.h coverhd.h efi332.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: ../../../shared/include/coverhd.h
$(INSTALL_DATA) $< $@
+CLEANFILES += coverhd.h
-$(PROJECT_INCLUDE)/efi332.h: efi332.h
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/efi332.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = bsp.h efi332.h
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/efi332/include/bsp.h b/c/src/lib/libbsp/m68k/efi332/include/bsp.h
index c44e1f75fd..dbd6f9bde4 100644
--- a/c/src/lib/libbsp/m68k/efi332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/efi332/include/bsp.h
@@ -19,6 +19,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <clockdrv.h>
#include <console.h>
diff --git a/c/src/lib/libbsp/m68k/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog
index bc16ae16e4..1bcc2baef3 100644
--- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog
+++ b/c/src/lib/libbsp/m68k/efi68k/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/efi68k/configure.in b/c/src/lib/libbsp/m68k/efi68k/configure.in
index 317051a6af..4b83195c2d 100644
--- a/c/src/lib/libbsp/m68k/efi68k/configure.in
+++ b/c/src/lib/libbsp/m68k/efi68k/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/efi68k/include/.cvsignore b/c/src/lib/libbsp/m68k/efi68k/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/efi68k/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/efi68k/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/efi68k/include/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am
index 74f64dafcb..cb5bb6bb0d 100644
--- a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am
@@ -4,29 +4,21 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/coverhd.h efi68k.h 16550.h DP8570A.h
+include_HEADERS = bsp.h coverhd.h efi68k.h 16550.h DP8570A.h bspopts.h
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/efi68k.h: efi68k.h
+$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/16550.h: 16550.h
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
$(INSTALL_DATA) $< $@
+CLEANFILES += coverhd.h
-$(PROJECT_INCLUDE)/DP8570A.h: DP8570A.h
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/efi68k.h \
- $(PROJECT_INCLUDE)/16550.h $(PROJECT_INCLUDE)/DP8570A.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = 16550.h DP8570A.h bsp.h efi68k.h
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h
index 362403d54c..647789c115 100644
--- a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h
@@ -19,6 +19,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <clockdrv.h>
#include <console.h>
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 5192de7ef4..1c43bc12ea 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/configure.in b/c/src/lib/libbsp/m68k/gen68302/configure.in
index 291f84678a..8cd8ef1311 100644
--- a/c/src/lib/libbsp/m68k/gen68302/configure.in
+++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/include/.cvsignore b/c/src/lib/libbsp/m68k/gen68302/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am
index fd41652289..709755bd95 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am
@@ -4,25 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h coverhd.h m302_int.h
+include_HEADERS = bsp.h coverhd.h m302_int.h bspopts.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/m302_int.h: m302_int.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/m302_int.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = bsp.h coverhd.h m302_int.h
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
index 0ea40ecb8b..341c30c1c7 100644
--- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index f941ee9423..2794fb58a9 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/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/gen68340/configure.in b/c/src/lib/libbsp/m68k/gen68340/configure.in
index 5907697f0b..f93ae58558 100644
--- a/c/src/lib/libbsp/m68k/gen68340/configure.in
+++ b/c/src/lib/libbsp/m68k/gen68340/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/gen68340/include/.cvsignore b/c/src/lib/libbsp/m68k/gen68340/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/.cvsignore
+++ b/c/src/lib/libbsp/m68k/gen68340/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/gen68340/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am
index 8bf11a4ce6..a718f5b9e2 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am
@@ -4,41 +4,21 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h coverhd.h m340uart.h m340timer.h m68340.h m68340.inc \
+include_HEADERS = bsp.h coverhd.h m340uart.h m340timer.h m68340.h m68340.inc \ bspopts.h
m68349.inc
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
+$(PROJECT_INCLUDE)/%.inc: %.inc
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/m340uart.h: m340uart.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m340timer.h: m340timer.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68340.h: m68340.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68340.inc: m68340.inc
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/m68349.inc: m68349.inc
- $(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/m340uart.h \
- $(PROJECT_INCLUDE)/m340timer.h $(PROJECT_INCLUDE)/m68340.h \
- $(PROJECT_INCLUDE)/m68340.inc $(PROJECT_INCLUDE)/m68349.inc
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = bsp.h coverhd.h m340timer.h m340uart.h m68340.h m68340.inc \
- m68349.inc
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index 657b3d5a48..94906a7066 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
@@ -24,6 +24,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <console.h>
#include <iosupp.h>