summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/armulator
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-05-24 20:07:01 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-05-24 20:07:01 +0000
commite86adc797d291ed76c3d9699509f1ad6ac231e76 (patch)
tree1893223eb83735ff27f9fa68fde36a3b0c4a9b1a /c/src/lib/libbsp/arm/armulator
parent2001-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-e86adc797d291ed76c3d9699509f1ad6ac231e76.tar.bz2
2001-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Add include/bspopts.h. * console/Makefile.am: Use *_HEADERS instead of *H_FILES. * irq/Makefile.am: Use *_HEADER instead of *H_FILES. * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h* * include/Makefile.am: Add bspopts.h, Use *_HEADER instead of *H_FILES. * include/bsp.h: Add bspopts.h.
Diffstat (limited to 'c/src/lib/libbsp/arm/armulator')
-rw-r--r--c/src/lib/libbsp/arm/armulator/ChangeLog9
-rw-r--r--c/src/lib/libbsp/arm/armulator/configure.in1
-rw-r--r--c/src/lib/libbsp/arm/armulator/include/.cvsignore5
-rw-r--r--c/src/lib/libbsp/arm/armulator/include/Makefile.am12
-rw-r--r--c/src/lib/libbsp/arm/armulator/include/bsp.h2
5 files changed, 22 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index fac8666885..f984a2a817 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in: Add include/bspopts.h.
+ * console/Makefile.am: Use *_HEADERS instead of *H_FILES.
+ * irq/Makefile.am: Use *_HEADER instead of *H_FILES.
+ * include/.cvsignore: Add bspopts.h*, coverhd.h, stamp-h*.
+ * include/Makefile.am: Add bspopts.h, Use *_HEADER instead of *H_FILES.
+ * include/bsp.h: Add 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/arm/armulator/configure.in b/c/src/lib/libbsp/arm/armulator/configure.in
index ed32809496..ce5a506819 100644
--- a/c/src/lib/libbsp/arm/armulator/configure.in
+++ b/c/src/lib/libbsp/arm/armulator/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/arm/armulator/include/.cvsignore b/c/src/lib/libbsp/arm/armulator/include/.cvsignore
index 282522db03..34cf1342d5 100644
--- a/c/src/lib/libbsp/arm/armulator/include/.cvsignore
+++ b/c/src/lib/libbsp/arm/armulator/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/arm/armulator/include/Makefile.am b/c/src/lib/libbsp/arm/armulator/include/Makefile.am
index 534884ac59..b11145642e 100644
--- a/c/src/lib/libbsp/arm/armulator/include/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/include/Makefile.am
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h ../../../shared/include/coverhd.h
+include_HEADERS = bsp.h coverhd.h bspopts.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -12,14 +12,12 @@ $(PROJECT_INCLUDE):
$(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/arm/armulator/include/bsp.h b/c/src/lib/libbsp/arm/armulator/include/bsp.h
index d0e0ca66ed..b85668f2b9 100644
--- a/c/src/lib/libbsp/arm/armulator/include/bsp.h
+++ b/c/src/lib/libbsp/arm/armulator/include/bsp.h
@@ -20,6 +20,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <iosupp.h>
#include <console.h>