Update #3254.
Update #3260.
---
c/src/lib/libcpu/sparc/Makefile.am | 1 -
c/src/lib/libcpu/sparc/preinstall.am | 4 ----
cpukit/score/cpu/sparc/Makefile.am | 3 +++
.../libcpu => cpukit/score/cpu}/sparc/include/libcpu/byteorder.h | 0
cpukit/score/cpu/sparc/preinstall.am | 9 +++++++++
5 files changed, 12 insertions(+), 5 deletions(-)
rename {c/src/lib/libcpu => cpukit/score/cpu}/sparc/include/libcpu/byteorder.h
(100%)
diff --git a/c/src/lib/libcpu/sparc/Makefile.am
b/c/src/lib/libcpu/sparc/Makefile.am
index f9872214f4..67a35ee4b8 100644
--- a/c/src/lib/libcpu/sparc/Makefile.am
+++ b/c/src/lib/libcpu/sparc/Makefile.am
@@ -6,7 +6,6 @@ noinst_PROGRAMS =
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS =
-include_libcpu_HEADERS += include/libcpu/byteorder.h
include_libcpu_HEADERS += include/libcpu/access.h
noinst_PROGRAMS += cache.rel
diff --git a/c/src/lib/libcpu/sparc/preinstall.am
b/c/src/lib/libcpu/sparc/preinstall.am
index 3e4a2a3c88..ec35254581 100644
--- a/c/src/lib/libcpu/sparc/preinstall.am
+++ b/c/src/lib/libcpu/sparc/preinstall.am
@@ -18,10 +18,6 @@ $(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-$(PROJECT_INCLUDE)/libcpu/byteorder.h: include/libcpu/byteorder.h
$(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
-
$(PROJECT_INCLUDE)/libcpu/access.h: include/libcpu/access.h
$(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/access.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/access.h
diff --git a/cpukit/score/cpu/sparc/Makefile.am
b/cpukit/score/cpu/sparc/Makefile.am
index 96d29e0e11..e03aabc0ff 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -1,5 +1,8 @@
include $(top_srcdir)/automake/compile.am
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS = include/libcpu/byteorder.h
+
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = rtems/asm.h
diff --git a/c/src/lib/libcpu/sparc/include/libcpu/byteorder.h
b/cpukit/score/cpu/sparc/include/libcpu/byteorder.h
similarity index 100%
rename from c/src/lib/libcpu/sparc/include/libcpu/byteorder.h
rename to cpukit/score/cpu/sparc/include/libcpu/byteorder.h
diff --git a/cpukit/score/cpu/sparc/preinstall.am
b/cpukit/score/cpu/sparc/preinstall.am
index 6bae48c717..13caf27e22 100644
--- a/cpukit/score/cpu/sparc/preinstall.am
+++ b/cpukit/score/cpu/sparc/preinstall.am
@@ -13,6 +13,15 @@ all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
CLEANFILES = $(PREINSTALL_FILES)
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
+ @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/byteorder.h: include/libcpu/byteorder.h
$(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
+
$(PROJECT_INCLUDE)/rtems/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
@: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
--
2.12.3
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
