summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i960/cvme961
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 /c/src/lib/libbsp/i960/cvme961
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.
Diffstat (limited to 'c/src/lib/libbsp/i960/cvme961')
-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
5 files changed, 21 insertions, 8 deletions
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>