[rtems commit] Move various driver interface definition headers file libcsupport/ to include/
Joel Sherrill
joel at rtems.org
Wed Mar 30 14:32:39 UTC 2016
Module: rtems
Branch: master
Commit: 92b6f6e9c9ced4edcb132e517314a6f4e772a7e9
Changeset: http://git.rtems.org/rtems/commit/?id=92b6f6e9c9ced4edcb132e517314a6f4e772a7e9
Author: Joel Sherrill <joel at rtems.org>
Date: Wed Mar 30 08:14:56 2016 -0500
Move various driver interface definition headers file libcsupport/ to include/
These were in libcsupport for historical reasons and the placement
no longer made sense.
As part of this move, some of the files were placed under subdirectories
which reflect their installed location.
Thank you git for allowing us to move files. Years of CVS resulted
in files being somewhere they no longer belonged.
---
cpukit/Makefile.am | 8 ++++++-
.../include => include/rtems}/clockdrv.h | 0
.../include => include/rtems}/console.h | 0
.../{libcsupport => }/include/rtems/framebuffer.h | 0
.../{libcsupport/include => include/rtems}/rtc.h | 0
.../{libcsupport => }/include/rtems/watchdogdrv.h | 0
cpukit/libcsupport/Makefile.am | 6 +----
cpukit/libcsupport/preinstall.am | 16 -------------
cpukit/preinstall.am | 26 +++++++++++++++++++---
9 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 86c20a9..c84ccc3 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -105,9 +105,15 @@ endif
include_rtems_HEADERS += include/rtems/concat.h
include_rtems_HEADERS += include/rtems/status-checks.h
-include_rtems_HEADERS += include/rtems/btimer.h
include_rtems_HEADERS += include/rtems/endian.h
+include_rtems_HEADERS += include/rtems/btimer.h
+include_rtems_HEADERS += include/rtems/console.h
+include_rtems_HEADERS += include/rtems/clockdrv.h
+include_rtems_HEADERS += include/rtems/framebuffer.h
+include_rtems_HEADERS += include/rtems/rtc.h
+include_rtems_HEADERS += include/rtems/watchdogdrv.h
+
## should be conditional and only installed for PowerPC, x86, and ARM
include_rtems_HEADERS += include/rtems/irq.h
diff --git a/cpukit/libcsupport/include/clockdrv.h b/cpukit/include/rtems/clockdrv.h
similarity index 100%
rename from cpukit/libcsupport/include/clockdrv.h
rename to cpukit/include/rtems/clockdrv.h
diff --git a/cpukit/libcsupport/include/console.h b/cpukit/include/rtems/console.h
similarity index 100%
rename from cpukit/libcsupport/include/console.h
rename to cpukit/include/rtems/console.h
diff --git a/cpukit/libcsupport/include/rtems/framebuffer.h b/cpukit/include/rtems/framebuffer.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/framebuffer.h
rename to cpukit/include/rtems/framebuffer.h
diff --git a/cpukit/libcsupport/include/rtc.h b/cpukit/include/rtems/rtc.h
similarity index 100%
rename from cpukit/libcsupport/include/rtc.h
rename to cpukit/include/rtems/rtc.h
diff --git a/cpukit/libcsupport/include/rtems/watchdogdrv.h b/cpukit/include/rtems/watchdogdrv.h
similarity index 100%
rename from cpukit/libcsupport/include/rtems/watchdogdrv.h
rename to cpukit/include/rtems/watchdogdrv.h
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index eee9da7..b3ad3db 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -6,12 +6,8 @@ libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS)
libcalloc_a_CPPFLAGS = $(AM_CPPFLAGS)
include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS = include/console.h
-include_rtems_HEADERS += include/clockdrv.h
-include_rtems_HEADERS += include/rtems/framebuffer.h
-include_rtems_HEADERS += include/iosupp.h
+include_rtems_HEADERS = include/iosupp.h
include_rtems_HEADERS += include/ringbuf.h
-include_rtems_HEADERS += include/rtc.h
include_rtems_HEADERS += include/rtems/tod.h
include_rtems_HEADERS += include/spurious.h
include_rtems_HEADERS += include/vmeintr.h
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
index 211a246..4b25d3c 100644
--- a/cpukit/libcsupport/preinstall.am
+++ b/cpukit/libcsupport/preinstall.am
@@ -18,18 +18,6 @@ $(PROJECT_INCLUDE)/rtems/$(dirstamp):
@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
-$(PROJECT_INCLUDE)/rtems/console.h: include/console.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/console.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/console.h
-
-$(PROJECT_INCLUDE)/rtems/clockdrv.h: include/clockdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/clockdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/clockdrv.h
-
-$(PROJECT_INCLUDE)/rtems/framebuffer.h: include/rtems/framebuffer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/framebuffer.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/framebuffer.h
-
$(PROJECT_INCLUDE)/rtems/iosupp.h: include/iosupp.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/iosupp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/iosupp.h
@@ -38,10 +26,6 @@ $(PROJECT_INCLUDE)/rtems/ringbuf.h: include/ringbuf.h $(PROJECT_INCLUDE)/rtems/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ringbuf.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ringbuf.h
-$(PROJECT_INCLUDE)/rtems/rtc.h: include/rtc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtc.h
-
$(PROJECT_INCLUDE)/rtems/tod.h: include/rtems/tod.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tod.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tod.h
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
index 0758ec5..c8f2cd3 100644
--- a/cpukit/preinstall.am
+++ b/cpukit/preinstall.am
@@ -245,13 +245,33 @@ $(PROJECT_INCLUDE)/rtems/status-checks.h: include/rtems/status-checks.h $(PROJEC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/status-checks.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/status-checks.h
+$(PROJECT_INCLUDE)/rtems/endian.h: include/rtems/endian.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/endian.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/endian.h
+
$(PROJECT_INCLUDE)/rtems/btimer.h: include/rtems/btimer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/btimer.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/btimer.h
-$(PROJECT_INCLUDE)/rtems/endian.h: include/rtems/endian.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/endian.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/endian.h
+$(PROJECT_INCLUDE)/rtems/console.h: include/rtems/console.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/console.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/console.h
+
+$(PROJECT_INCLUDE)/rtems/clockdrv.h: include/rtems/clockdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/clockdrv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/clockdrv.h
+
+$(PROJECT_INCLUDE)/rtems/framebuffer.h: include/rtems/framebuffer.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/framebuffer.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/framebuffer.h
+
+$(PROJECT_INCLUDE)/rtems/rtc.h: include/rtems/rtc.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtc.h
+
+$(PROJECT_INCLUDE)/rtems/watchdogdrv.h: include/rtems/watchdogdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/watchdogdrv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/watchdogdrv.h
$(PROJECT_INCLUDE)/rtems/irq.h: include/rtems/irq.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/irq.h
More information about the vc
mailing list