summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-06-15 15:31:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-06-15 15:31:18 +0000
commit3f6500bf0ac87c18037fa4eced89b233450d369e (patch)
treee89deafe8092447454dd5a006f7d323f15eacc8a /c
parent2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-3f6500bf0ac87c18037fa4eced89b233450d369e.tar.bz2
2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, preinstall.am: Make an RTEMS specific umon.h wrapper include file.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/arm/csb337/ChangeLog5
-rw-r--r--c/src/lib/libbsp/arm/csb337/Makefile.am2
-rw-r--r--c/src/lib/libbsp/arm/csb337/preinstall.am9
3 files changed, 16 insertions, 0 deletions
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 2cd610022f..ee52a66eda 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,5 +1,10 @@
2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * Makefile.am, preinstall.am: Make an RTEMS specific umon.h wrapper
+ include file.
+
+2009-06-15 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* Makefile.am: Re-add basic console code.
2009-06-12 Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index c238eff521..55528f3870 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -19,6 +19,8 @@ include_umon_HEADERS = ../../shared/umon/cli.h
include_umon_HEADERS += ../../shared/umon/monlib.h
include_umon_HEADERS += ../../shared/umon/tfs.h
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = ../../shared/umon/umon.h
nodist_include_HEADERS = include/bspopts.h
nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
diff --git a/c/src/lib/libbsp/arm/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am
index d14c41a24c..f92b20d3a1 100644
--- a/c/src/lib/libbsp/arm/csb337/preinstall.am
+++ b/c/src/lib/libbsp/arm/csb337/preinstall.am
@@ -66,6 +66,15 @@ $(PROJECT_INCLUDE)/umon/tfs.h: ../../shared/umon/tfs.h $(PROJECT_INCLUDE)/umon/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/umon/tfs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/umon/tfs.h
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
+ @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/umon.h: ../../shared/umon/umon.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/umon.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/umon.h
+
$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h