[rtems commit] or1ksim/Makefile.am: Install shared tm27. h and regenerate preinstall.am

Joel Sherrill joel at rtems.org
Tue Sep 2 15:48:57 UTC 2014


Module:    rtems
Branch:    master
Commit:    2617cd3e0413d5f74ce56d3d001173e3437b31ec
Changeset: http://git.rtems.org/rtems/commit/?id=2617cd3e0413d5f74ce56d3d001173e3437b31ec

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Tue Sep  2 10:57:18 2014 -0500

or1ksim/Makefile.am: Install shared tm27.h and regenerate preinstall.am

---

 c/src/lib/libbsp/or1k/or1ksim/Makefile.am   |    2 +-
 c/src/lib/libbsp/or1k/or1ksim/preinstall.am |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/or1k/or1ksim/Makefile.am b/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
index 1ff43ed..7af4fd0 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
+++ b/c/src/lib/libbsp/or1k/or1ksim/Makefile.am
@@ -19,6 +19,7 @@ dist_project_lib_DATA = bsp_specs
 
 include_bsp_HEADERS =
 include_HEADERS = include/bsp.h
+include_HEADERS += ../../shared/include/tm27.h
 
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 include_bsp_HEADERS += ../shared/include/linker-symbols.h
@@ -29,7 +30,6 @@ include_bsp_HEADERS += ../../shared/include/irq-info.h
 include_bsp_HEADERS += ../../shared/include/stackalloc.h
 include_bsp_HEADERS += ../../shared/include/uart-output-char.h
 include_bsp_HEADERS += ../../shared/tod.h
-include_bsp_HEADERS += ../../shared/include/tm27.h
 include_bsp_HEADERS += include/irq.h
 include_bsp_HEADERS += include/uart.h
 include_bsp_HEADERS += include/or1ksim.h
diff --git a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
index a83e053..1561b18 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
+++ b/c/src/lib/libbsp/or1k/or1ksim/preinstall.am
@@ -46,6 +46,10 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
 
+$(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
+
 $(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
@@ -82,10 +86,6 @@ $(PROJECT_INCLUDE)/bsp/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/bsp/$(dirsta
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tod.h
 
-$(PROJECT_INCLUDE)/bsp/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tm27.h
-
 $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h



More information about the vc mailing list