Include files now installed as <rtems/*.h>.

14 files changed, 16 insertions, 18 deletions

diff --git a/c/src/lib/libmisc/rtmonuse/Makefile.in b/c/src/lib/libmisc/rtmonuse/Makefile.in
index a344c894b6..50985a7c36 100644
--- a/c/src/lib/libmisc/rtmonuse/Makefile.in
+++ b/c/src/lib/libmisc/rtmonuse/Makefile.in
@@ -50,5 +50,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/lib/libmisc/rtmonuse/rtmonuse.c b/c/src/lib/libmisc/rtmonuse/rtmonuse.c
index 843d29468e..d10008a302 100644
--- a/c/src/lib/libmisc/rtmonuse/rtmonuse.c
+++ b/c/src/lib/libmisc/rtmonuse/rtmonuse.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "rtmonuse.h"
+#include <rtems/rtmonuse.h>
 
 typedef struct {
   rtems_id     id;
diff --git a/c/src/lib/libmisc/stackchk/Makefile.in b/c/src/lib/libmisc/stackchk/Makefile.in
index 2708e825bc..7349b140f0 100644
--- a/c/src/lib/libmisc/stackchk/Makefile.in
+++ b/c/src/lib/libmisc/stackchk/Makefile.in
@@ -50,4 +50,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
+	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/lib/libmisc/stackchk/check.c b/c/src/lib/libmisc/stackchk/check.c
index 5bfb69bfb6..ac688c2a2e 100644
--- a/c/src/lib/libmisc/stackchk/check.c
+++ b/c/src/lib/libmisc/stackchk/check.c
@@ -40,7 +40,7 @@ extern rtems_configuration_table BSP_Configuration;
 #include <string.h>
 #include <stdlib.h>
 
-#include "stackchk.h"
+#include <rtems/stackchk.h>
 #include "internal.h"
 
 /*
diff --git a/c/src/libmisc/rtmonuse/Makefile.in b/c/src/libmisc/rtmonuse/Makefile.in
index a344c894b6..50985a7c36 100644
--- a/c/src/libmisc/rtmonuse/Makefile.in
+++ b/c/src/libmisc/rtmonuse/Makefile.in
@@ -50,5 +50,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
-#	$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
+	$(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/rtmonuse/rtmonuse.c b/c/src/libmisc/rtmonuse/rtmonuse.c
index 843d29468e..d10008a302 100644
--- a/c/src/libmisc/rtmonuse/rtmonuse.c
+++ b/c/src/libmisc/rtmonuse/rtmonuse.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "rtmonuse.h"
+#include <rtems/rtmonuse.h>
 
 typedef struct {
   rtems_id     id;
diff --git a/c/src/libmisc/stackchk/Makefile.in b/c/src/libmisc/stackchk/Makefile.in
index 2708e825bc..7349b140f0 100644
--- a/c/src/libmisc/stackchk/Makefile.in
+++ b/c/src/libmisc/stackchk/Makefile.in
@@ -50,4 +50,4 @@ ${LIB}: ${SRCS} ${OBJS}
 	$(make-library)
 
 all:	${ARCH} $(SRCS) $(LIB)
-	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)
+	 $(INSTALL) -m 444 ${INSTALLED_H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/libmisc/stackchk/check.c b/c/src/libmisc/stackchk/check.c
index 5bfb69bfb6..ac688c2a2e 100644
--- a/c/src/libmisc/stackchk/check.c
+++ b/c/src/libmisc/stackchk/check.c
@@ -40,7 +40,7 @@ extern rtems_configuration_table BSP_Configuration;
 #include <string.h>
 #include <stdlib.h>
 
-#include "stackchk.h"
+#include <rtems/stackchk.h>
 #include "internal.h"
 
 /*
diff --git a/c/src/tests/libtests/rtmonuse/init.c b/c/src/tests/libtests/rtmonuse/init.c
index c599df3c5a..6f3849e4d5 100644
--- a/c/src/tests/libtests/rtmonuse/init.c
+++ b/c/src/tests/libtests/rtmonuse/init.c
@@ -25,7 +25,7 @@
 #define TEST_INIT
 #include "system.h"
 
-#include "rtmonuse.h"
+#include <rtems/rtmonuse.h>
 
 rtems_task Init(
   rtems_task_argument argument
diff --git a/c/src/tests/libtests/rtmonuse/task1.c b/c/src/tests/libtests/rtmonuse/task1.c
index 92b22178af..3ee1080a4e 100644
--- a/c/src/tests/libtests/rtmonuse/task1.c
+++ b/c/src/tests/libtests/rtmonuse/task1.c
@@ -21,8 +21,8 @@
 
 #include "system.h"
 
-#include <cpuuse.h>
-#include "rtmonuse.h"
+#include <rtems/cpuuse.h>
+#include <rtems/rtmonuse.h>
 
 rtems_unsigned32    Periods[6]    = { 0,   2,   2,   2,   2, 100 };
 rtems_unsigned32    Iterations[6] = { 0,  50,  50,  50,  50,   1 };
diff --git a/cpukit/libmisc/rtmonuse/rtmonuse.c b/cpukit/libmisc/rtmonuse/rtmonuse.c
index 843d29468e..d10008a302 100644
--- a/cpukit/libmisc/rtmonuse/rtmonuse.c
+++ b/cpukit/libmisc/rtmonuse/rtmonuse.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "rtmonuse.h"
+#include <rtems/rtmonuse.h>
 
 typedef struct {
   rtems_id     id;
diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c
index 5bfb69bfb6..ac688c2a2e 100644
--- a/cpukit/libmisc/stackchk/check.c
+++ b/cpukit/libmisc/stackchk/check.c
@@ -40,7 +40,7 @@ extern rtems_configuration_table BSP_Configuration;
 #include <string.h>
 #include <stdlib.h>
 
-#include "stackchk.h"
+#include <rtems/stackchk.h>
 #include "internal.h"
 
 /*
diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c
index c599df3c5a..6f3849e4d5 100644
--- a/testsuites/libtests/rtmonuse/init.c
+++ b/testsuites/libtests/rtmonuse/init.c
@@ -25,7 +25,7 @@
 #define TEST_INIT
 #include "system.h"
 
-#include "rtmonuse.h"
+#include <rtems/rtmonuse.h>
 
 rtems_task Init(
   rtems_task_argument argument
diff --git a/testsuites/libtests/rtmonuse/task1.c b/testsuites/libtests/rtmonuse/task1.c
index 92b22178af..3ee1080a4e 100644
--- a/testsuites/libtests/rtmonuse/task1.c
+++ b/testsuites/libtests/rtmonuse/task1.c
@@ -21,8 +21,8 @@
 
 #include "system.h"
 
-#include <cpuuse.h>
-#include "rtmonuse.h"
+#include <rtems/cpuuse.h>
+#include <rtems/rtmonuse.h>
 
 rtems_unsigned32    Periods[6]    = { 0,   2,   2,   2,   2, 100 };
 rtems_unsigned32    Iterations[6] = { 0,  50,  50,  50,  50,   1 };