summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/exec/score/Makefile.in2
-rw-r--r--c/src/exec/score/include/Makefile.in14
-rw-r--r--c/src/exec/score/include/rtems/Makefile.in14
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.in12
-rw-r--r--c/src/exec/score/include/rtems/wrap/Makefile.in20
-rw-r--r--c/src/exec/score/inline/Makefile.in14
-rw-r--r--c/src/exec/score/inline/rtems/Makefile.in14
-rw-r--r--c/src/exec/score/macros/Makefile.in14
-rw-r--r--c/src/exec/score/macros/rtems/Makefile.in14
-rw-r--r--configure14
-rw-r--r--configure.in7
11 files changed, 124 insertions, 15 deletions
diff --git a/c/src/exec/score/Makefile.in b/c/src/exec/score/Makefile.in
index 3266e1fc58..0558304188 100644
--- a/c/src/exec/score/Makefile.in
+++ b/c/src/exec/score/Makefile.in
@@ -11,4 +11,4 @@ PROJECT_ROOT = @PROJECT_ROOT@
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/directory.cfg
-SUB_DIRS=headers $(INLINE) tools cpu src
+SUB_DIRS=include $(INLINE) tools cpu src
diff --git a/c/src/exec/score/include/Makefile.in b/c/src/exec/score/include/Makefile.in
new file mode 100644
index 0000000000..11b5d84e87
--- /dev/null
+++ b/c/src/exec/score/include/Makefile.in
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=rtems
diff --git a/c/src/exec/score/include/rtems/Makefile.in b/c/src/exec/score/include/rtems/Makefile.in
new file mode 100644
index 0000000000..e5f650d756
--- /dev/null
+++ b/c/src/exec/score/include/rtems/Makefile.in
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=wrap score
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
index 792ca73fce..86ba5ab541 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/c/src/exec/score/include/rtems/score/Makefile.in
@@ -19,15 +19,7 @@ H_PIECES= address apiext bitfield chain context copyrt coremsg coremutex \
tod tqdata userext watchdog wkspace
H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
-# H_FILES that get installed in the rtems subdirectoy
-SAPI_H_PIECES=debug system
-SAPI_H_FILES=$(SAPI_H_PIECES:%=$(srcdir)/%.h)
-
-# H_FILES that get installed at the top level
-EXTERNAL_H_PIECES =
-EXTERNAL_H_FILES=$(EXTERNAL_H_PIECES:%=$(srcdir)/%.h)
-
-SRCS=$(H_FILES) $(SAPI_H_FILES) $(EXTERNAL_H_FILES)
+SRCS=$(H_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg
@@ -44,5 +36,3 @@ CLOBBER_ADDITIONS +=
all: $(SRCS)
$(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
- $(INSTALL) -m 444 ${SAPI_H_FILES} $(PROJECT_INCLUDE)/rtems/
-# $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
diff --git a/c/src/exec/score/include/rtems/wrap/Makefile.in b/c/src/exec/score/include/rtems/wrap/Makefile.in
new file mode 100644
index 0000000000..b6abaa78b4
--- /dev/null
+++ b/c/src/exec/score/include/rtems/wrap/Makefile.in
@@ -0,0 +1,20 @@
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+H_PIECES=debug system
+H_FILES=$(H_PIECES:%=$(srcdir)/../%.h)
+
+SRCS=$(H_FILES)
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+all: $(SRCS)
+ $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems
diff --git a/c/src/exec/score/inline/Makefile.in b/c/src/exec/score/inline/Makefile.in
index 228ef54748..f21b40f456 100644
--- a/c/src/exec/score/inline/Makefile.in
+++ b/c/src/exec/score/inline/Makefile.in
@@ -8,6 +8,20 @@ VPATH = @srcdir@
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=rtems
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
# We only build multiprocessing related files if HAS_MP was defined
MP_PIECES_yes_V = mppkt objectmp threadmp
MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
diff --git a/c/src/exec/score/inline/rtems/Makefile.in b/c/src/exec/score/inline/rtems/Makefile.in
new file mode 100644
index 0000000000..9793eb1590
--- /dev/null
+++ b/c/src/exec/score/inline/rtems/Makefile.in
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=score
diff --git a/c/src/exec/score/macros/Makefile.in b/c/src/exec/score/macros/Makefile.in
index 228ef54748..f21b40f456 100644
--- a/c/src/exec/score/macros/Makefile.in
+++ b/c/src/exec/score/macros/Makefile.in
@@ -8,6 +8,20 @@ VPATH = @srcdir@
RTEMS_ROOT = @top_srcdir@
PROJECT_ROOT = @PROJECT_ROOT@
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=rtems
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
# We only build multiprocessing related files if HAS_MP was defined
MP_PIECES_yes_V = mppkt objectmp threadmp
MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
diff --git a/c/src/exec/score/macros/rtems/Makefile.in b/c/src/exec/score/macros/rtems/Makefile.in
new file mode 100644
index 0000000000..9793eb1590
--- /dev/null
+++ b/c/src/exec/score/macros/rtems/Makefile.in
@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+@SET_MAKE@
+srcdir = @srcdir@
+VPATH = @srcdir@
+RTEMS_ROOT = @top_srcdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/directory.cfg
+
+SUB_DIRS=score
diff --git a/configure b/configure
index 3d59d8f300..473573303c 100644
--- a/configure
+++ b/configure
@@ -3839,8 +3839,13 @@ c/src/Makefile
c/src/exec/Makefile
c/src/exec/score/Makefile
c/src/exec/score/cpu/Makefile
-c/src/exec/score/headers/Makefile
+c/src/exec/score/include/Makefile
+c/src/exec/score/include/rtems/Makefile
+c/src/exec/score/include/rtems/wrap/Makefile
+c/src/exec/score/include/rtems/score/Makefile
c/src/exec/score/${inline_dir}/Makefile
+c/src/exec/score/${inline_dir}/rtems/Makefile
+c/src/exec/score/${inline_dir}/rtems/score/Makefile
c/src/exec/score/src/Makefile
c/src/exec/score/tools/Makefile
c/src/exec/score/tools/generic/Makefile
@@ -4009,8 +4014,13 @@ c/src/Makefile
c/src/exec/Makefile
c/src/exec/score/Makefile
c/src/exec/score/cpu/Makefile
-c/src/exec/score/headers/Makefile
+c/src/exec/score/include/Makefile
+c/src/exec/score/include/rtems/Makefile
+c/src/exec/score/include/rtems/wrap/Makefile
+c/src/exec/score/include/rtems/score/Makefile
c/src/exec/score/${inline_dir}/Makefile
+c/src/exec/score/${inline_dir}/rtems/Makefile
+c/src/exec/score/${inline_dir}/rtems/score/Makefile
c/src/exec/score/src/Makefile
c/src/exec/score/tools/Makefile
c/src/exec/score/tools/generic/Makefile
diff --git a/configure.in b/configure.in
index 3603647396..af45a898bd 100644
--- a/configure.in
+++ b/configure.in
@@ -522,8 +522,13 @@ c/src/Makefile
c/src/exec/Makefile
c/src/exec/score/Makefile
c/src/exec/score/cpu/Makefile
-c/src/exec/score/headers/Makefile
+c/src/exec/score/include/Makefile
+c/src/exec/score/include/rtems/Makefile
+c/src/exec/score/include/rtems/wrap/Makefile
+c/src/exec/score/include/rtems/score/Makefile
c/src/exec/score/${inline_dir}/Makefile
+c/src/exec/score/${inline_dir}/rtems/Makefile
+c/src/exec/score/${inline_dir}/rtems/score/Makefile
c/src/exec/score/src/Makefile
c/src/exec/score/tools/Makefile
c/src/exec/score/tools/generic/Makefile