summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-06-08 13:47:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-06-08 13:47:09 +0000
commit9f70652bc9c83b069857abc36e2a4154430a7537 (patch)
tree864e3798e5cdd385451427e4878a90d106d92c18
parent2001-05-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-9f70652bc9c83b069857abc36e2a4154430a7537.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.
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/ChangeLog7
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/configure.in1
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/include/.cvsignore5
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/include/Makefile.am17
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog7
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/configure.in1
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am22
-rw-r--r--c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/cvme961/ChangeLog7
-rw-r--r--c/src/lib/libbsp/i960/cvme961/configure.in1
-rw-r--r--c/src/lib/libbsp/i960/cvme961/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/i960/cvme961/include/Makefile.am15
-rw-r--r--c/src/lib/libbsp/i960/cvme961/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/i960sim/ChangeLog7
-rw-r--r--c/src/lib/libbsp/i960/i960sim/configure.in1
-rw-r--r--c/src/lib/libbsp/i960/i960sim/include/.cvsignore5
-rw-r--r--c/src/lib/libbsp/i960/i960sim/include/Makefile.am15
-rw-r--r--c/src/lib/libbsp/i960/i960sim/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/ChangeLog7
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/configure.in1
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/include/Makefile.am15
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am2
26 files changed, 114 insertions, 44 deletions
diff --git a/c/src/lib/libbsp/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog
index ab6ddaba15..8214cdb052 100644
--- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog
+++ b/c/src/lib/libbsp/h8300/h8sim/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/h8300/h8sim/configure.in b/c/src/lib/libbsp/h8300/h8sim/configure.in
index 2c1a108ba7..26943f4851 100644
--- a/c/src/lib/libbsp/h8300/h8sim/configure.in
+++ b/c/src/lib/libbsp/h8300/h8sim/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/h8300/h8sim/include/.cvsignore b/c/src/lib/libbsp/h8300/h8sim/include/.cvsignore
index 282522db03..7394c340a6 100644
--- a/c/src/lib/libbsp/h8300/h8sim/include/.cvsignore
+++ b/c/src/lib/libbsp/h8300/h8sim/include/.cvsignore
@@ -1,2 +1,7 @@
Makefile
Makefile.in
+bspopts.h
+bspopts.h.in
+coverhd.h
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am b/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am
index 1d6c3074ec..11390a6626 100644
--- a/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am
+++ b/c/src/lib/libbsp/h8300/h8sim/include/Makefile.am
@@ -4,22 +4,21 @@
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
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h
+$(PROJECT_INCLUDE)/%.h: %.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/h8300/h8sim/include/bsp.h b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
index 22e15dcabb..0f17b92555 100644
--- a/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
+++ b/c/src/lib/libbsp/h8300/h8sim/include/bsp.h
@@ -20,6 +20,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <iosupp.h>
#include <console.h>
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog b/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
index 5630cb21b3..1bb1845278 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/ChangeLog
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/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/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
index 04b6bd3dbe..9934b13473 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
@@ -24,6 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "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/hppa1.1/simhppa/include/.cvsignore b/c/src/lib/libbsp/hppa1.1/simhppa/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/.cvsignore
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/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/hppa1.1/simhppa/include/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am
index d2abb7f5c7..ab7871aeb5 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am
@@ -4,9 +4,9 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/coverhd.h
-
-RTEMS_H_FILES = ttydrv.h
+include_rtemsdir = $(includedir)/rtems
+include_HEADERS = bsp.h coverhd.h bspopts.h
+include_rtems_HEADERS = ttydrv.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -14,21 +14,21 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/rtems:
$(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) $< $@
+CLEANFILES += coverhd.h
-$(PROJECT_INCLUDE)/rtems/ttydrv.h: ttydrv.h
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/rtems \
- $(PROJECT_INCLUDE)/rtems/ttydrv.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=%(PROJECT_INCLUDE)/%) \
+ $(PROJECT_INCLUDE)/rtems \
+ $(include_HEADERS:%=%(PROJECT_INCLUDE)/rtems/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = bsp.h ttydrv.h
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
index fb35dfb711..9cf0c8c65e 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h
@@ -19,6 +19,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <clockdrv.h>
#include <rtems/ttydrv.h>
diff --git a/c/src/lib/libbsp/i960/cvme961/ChangeLog b/c/src/lib/libbsp/i960/cvme961/ChangeLog
index 7ed771f720..7081572725 100644
--- a/c/src/lib/libbsp/i960/cvme961/ChangeLog
+++ b/c/src/lib/libbsp/i960/cvme961/ChangeLog
@@ -1,4 +1,11 @@
+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/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in
index 66e7b09106..c7a62730c9 100644
--- a/c/src/lib/libbsp/i960/cvme961/configure.in
+++ b/c/src/lib/libbsp/i960/cvme961/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
diff --git a/c/src/lib/libbsp/i960/cvme961/include/.cvsignore b/c/src/lib/libbsp/i960/cvme961/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/.cvsignore
+++ b/c/src/lib/libbsp/i960/cvme961/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/i960/cvme961/include/Makefile.am b/c/src/lib/libbsp/i960/cvme961/include/Makefile.am
index 1d6c3074ec..54daff0963 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.am
+++ b/c/src/lib/libbsp/i960/cvme961/include/Makefile.am
@@ -4,22 +4,21 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/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: ../../../shared/include/coverhd.h
- $(INSTALL_DATA) $< $@
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+ cp $< $@
+CLEANFILES += coverhd.h
-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/i960/cvme961/include/bsp.h b/c/src/lib/libbsp/i960/cvme961/include/bsp.h
index 1547b40aa6..91e93a91cf 100644
--- a/c/src/lib/libbsp/i960/cvme961/include/bsp.h
+++ b/c/src/lib/libbsp/i960/cvme961/include/bsp.h
@@ -21,6 +21,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <libcpu/i960CA.h>
#include <iosupp.h>
diff --git a/c/src/lib/libbsp/i960/i960sim/ChangeLog b/c/src/lib/libbsp/i960/i960sim/ChangeLog
index dca513be50..3e9992cc36 100644
--- a/c/src/lib/libbsp/i960/i960sim/ChangeLog
+++ b/c/src/lib/libbsp/i960/i960sim/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/i960/i960sim/configure.in b/c/src/lib/libbsp/i960/i960sim/configure.in
index 087294e781..c950fa5a20 100644
--- a/c/src/lib/libbsp/i960/i960sim/configure.in
+++ b/c/src/lib/libbsp/i960/i960sim/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/i960/i960sim/include/.cvsignore b/c/src/lib/libbsp/i960/i960sim/include/.cvsignore
index 282522db03..34cf1342d5 100644
--- a/c/src/lib/libbsp/i960/i960sim/include/.cvsignore
+++ b/c/src/lib/libbsp/i960/i960sim/include/.cvsignore
@@ -1,2 +1,7 @@
Makefile
Makefile.in
+coverhd.h
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/i960/i960sim/include/Makefile.am b/c/src/lib/libbsp/i960/i960sim/include/Makefile.am
index 1d6c3074ec..54daff0963 100644
--- a/c/src/lib/libbsp/i960/i960sim/include/Makefile.am
+++ b/c/src/lib/libbsp/i960/i960sim/include/Makefile.am
@@ -4,22 +4,21 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/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: ../../../shared/include/coverhd.h
- $(INSTALL_DATA) $< $@
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+ cp $< $@
+CLEANFILES += coverhd.h
-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/i960/i960sim/include/bsp.h b/c/src/lib/libbsp/i960/i960sim/include/bsp.h
index 5e641736bf..f320be8ffc 100644
--- a/c/src/lib/libbsp/i960/i960sim/include/bsp.h
+++ b/c/src/lib/libbsp/i960/i960sim/include/bsp.h
@@ -20,6 +20,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <iosupp.h>
#include <console.h>
diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
index 0eb517fa2f..ea17434749 100644
--- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog
+++ b/c/src/lib/libbsp/i960/rxgen960/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/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in
index 12e45e829a..9d951cfff0 100644
--- a/c/src/lib/libbsp/i960/rxgen960/configure.in
+++ b/c/src/lib/libbsp/i960/rxgen960/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/i960/rxgen960/include/.cvsignore b/c/src/lib/libbsp/i960/rxgen960/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/.cvsignore
+++ b/c/src/lib/libbsp/i960/rxgen960/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/i960/rxgen960/include/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/include/Makefile.am
index da44c1faa9..e4796dc6b2 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/include/Makefile.am
@@ -4,22 +4,23 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/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: ../../../shared/include/coverhd.h
- $(INSTALL_DATA) $< $@
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+ cp $< $@
+CLEANFILES += coverhd.h
-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 rxgen960_config.h
+EXTRA_DIST = rxgen960_config.h
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
index a6a88f1aa5..984e84c5d8 100644
--- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
+++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h
@@ -21,6 +21,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <libcpu/i960RP.h>
#include <iosupp.h>
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
index 1252d54181..f91f12204e 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -15,7 +15,7 @@ C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c cntrltbl.c \
nulsystbl.c prcb.c rom_cntrltbl.c rom_ibr.c rom_prcb.c sbrk.c sctns.c \
setvec.c systbl.c
-H_FILES = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \
+noinst_HEADERS = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \
frmstr.h i960.h ihandler.h intrtbl.h main.h memchnl.h pmc901_memmap.h \
prcb.h rom_ibr.h rommon.h sctns.h systbl.h time.h types.h