summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:30:52 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:30:52 +0000
commitff61414ac86ec7097a1c39a6904dacddf6f90599 (patch)
treef25ec3c1da4003d604a0b1a5fe90b87dc4cd7f1a
parent5be35eecb438fb7c18d979215cce927a2e863996 (diff)
downloadrtems-ff61414ac86ec7097a1c39a6904dacddf6f90599.tar.bz2
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/Makefile.am: Remove. * include/rtems/Makefile.am: Remove. * include/Makefile.am: Handle subdirs, require automake-1.5. * macros/rtems/Makefile.am: Remove. * macros/rtems/score/Makefile.am: Remove. * macros/Makefile.am: Handle subdirs, require automake-1.5. * inline/rtems/Makefile.am: Remove. * inline/rtems/score/Makefile.am: Remove. * inline/Makefile.am: Handle subdirs, require automake-1.5. * Makefile.am: require automake-1.5
-rw-r--r--c/src/exec/score/ChangeLog13
-rw-r--r--c/src/exec/score/Makefile.am2
-rw-r--r--c/src/exec/score/include/Makefile.am61
-rw-r--r--c/src/exec/score/include/rtems/Makefile.am24
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.am49
-rw-r--r--c/src/exec/score/inline/Makefile.am40
-rw-r--r--c/src/exec/score/inline/rtems/Makefile.am10
-rw-r--r--c/src/exec/score/inline/rtems/score/Makefile.am39
-rw-r--r--c/src/exec/score/macros/Makefile.am40
-rw-r--r--c/src/exec/score/macros/rtems/Makefile.am10
-rw-r--r--c/src/exec/score/macros/rtems/score/Makefile.am39
-rw-r--r--cpukit/score/ChangeLog13
-rw-r--r--cpukit/score/Makefile.am2
-rw-r--r--cpukit/score/include/Makefile.am61
-rw-r--r--cpukit/score/inline/Makefile.am40
-rw-r--r--cpukit/score/macros/Makefile.am40
16 files changed, 290 insertions, 193 deletions
diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog
index 6eb5467d98..27a536abc1 100644
--- a/c/src/exec/score/ChangeLog
+++ b/c/src/exec/score/ChangeLog
@@ -1,4 +1,17 @@
+2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/rtems/Makefile.am: Remove.
+ * include/rtems/Makefile.am: Remove.
+ * include/Makefile.am: Handle subdirs, require automake-1.5.
+ * macros/rtems/Makefile.am: Remove.
+ * macros/rtems/score/Makefile.am: Remove.
+ * macros/Makefile.am: Handle subdirs, require automake-1.5.
+ * inline/rtems/Makefile.am: Remove.
+ * inline/rtems/score/Makefile.am: Remove.
+ * inline/Makefile.am: Handle subdirs, require automake-1.5.
+ * Makefile.am: require automake-1.5
+
2001-09-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/score/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/c/src/exec/score/Makefile.am b/c/src/exec/score/Makefile.am
index 411e001881..9eee483746 100644
--- a/c/src/exec/score/Makefile.am
+++ b/c/src/exec/score/Makefile.am
@@ -2,7 +2,7 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = include inline macros cpu src
diff --git a/c/src/exec/score/include/Makefile.am b/c/src/exec/score/include/Makefile.am
index 0c97211587..f8b9edd4e1 100644
--- a/c/src/exec/score/include/Makefile.am
+++ b/c/src/exec/score/include/Makefile.am
@@ -2,9 +2,64 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+include_rtemsdir = $(includedir)/rtems
+
+$(PROJECT_INCLUDE)/rtems:
+ @$(mkinstalldirs) $@
+
+include_rtems_HEADERS = rtems/debug.h rtems/system.h rtems/seterr.h
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+include_rtems_scoredir = $(includedir)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
+
+# We only build multiprocessing related files if HAS_MP was defined
+MP_H_FILES = rtems/score/mpci.h rtems/score/mppkt.h rtems/score/objectmp.h \
+ rtems/score/threadmp.h
+
+# H_FILES that get installed in the rtems/score subdirectoy
+STD_H_FILES = rtems/score/address.h rtems/score/apiext.h \
+ rtems/score/bitfield.h rtems/score/chain.h rtems/score/context.h \
+ rtems/score/copyrt.h rtems/score/coremsg.h rtems/score/coremutex.h \
+ rtems/score/coresem.h rtems/score/heap.h rtems/score/interr.h \
+ rtems/score/isr.h rtems/score/object.h rtems/score/priority.h \
+ rtems/score/stack.h rtems/score/states.h rtems/score/sysstate.h \
+ rtems/score/thread.h rtems/score/threadq.h rtems/score/tod.h \
+ rtems/score/tqdata.h rtems/score/userext.h rtems/score/watchdog.h \
+ rtems/score/wkspace.h
+
+if HAS_MP
+include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) rtems/score/cpuopts.h
+else
+include_rtems_score_HEADERS = $(STD_H_FILES) rtems/score/cpuopts.h
+endif
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+# make the cpu dependent options file
+# FIXME: We are exporting a config-header here, which is a bad idea in
+# general
+rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
+ @echo "/* target cpu dependent options file */" >$@
+ @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
+ @echo >>$@
+ @echo "#ifndef __CPU_OPTIONS_h" >>$@
+ @echo "#define __CPU_OPTIONS_h" >>$@
+ @echo >>$@
+ @cat cpuopts-tmp.h >>$@
+ @echo >>$@
+ @echo "#endif" >>$@
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/include/rtems/Makefile.am b/c/src/exec/score/include/rtems/Makefile.am
deleted file mode 100644
index 0ecc8ca925..0000000000
--- a/c/src/exec/score/include/rtems/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtemsdir = $(includedir)/rtems
-
-include_rtems_HEADERS = debug.h system.h seterr.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
- $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
-
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-SUBDIRS = score
-
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/include/rtems/score/Makefile.am b/c/src/exec/score/include/rtems/score/Makefile.am
deleted file mode 100644
index 075d7fae2f..0000000000
--- a/c/src/exec/score/include/rtems/score/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-# We only build multiprocessing related files if HAS_MP was defined
-MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h
-
-# H_FILES that get installed in the rtems/score subdirectoy
-STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h \
- coremsg.h coremutex.h coresem.h heap.h interr.h isr.h object.h \
- priority.h stack.h states.h sysstate.h thread.h threadq.h tod.h tqdata.h \
- userext.h watchdog.h wkspace.h
-
-if HAS_MP
-include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) cpuopts.h
-else
-include_rtems_score_HEADERS = $(STD_H_FILES) cpuopts.h
-endif
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
- $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
-
-$(PROJECT_INCLUDE)/rtems/score:
- @$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-# make the cpu dependent options file
-# FIXME: We are exporting a config-header here, which is a bad idea in
-# general
-cpuopts.h: cpuopts-tmp.h
- @echo "/* target cpu dependent options file */" >$@
- @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
- @echo >>$@
- @echo "#ifndef __CPU_OPTIONS_h" >>$@
- @echo "#define __CPU_OPTIONS_h" >>$@
- @echo >>$@
- @cat cpuopts-tmp.h >>$@
- @echo >>$@
- @echo "#endif" >>$@
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/inline/Makefile.am b/c/src/exec/score/inline/Makefile.am
index 0c97211587..1bd2cecc7f 100644
--- a/c/src/exec/score/inline/Makefile.am
+++ b/c/src/exec/score/inline/Makefile.am
@@ -2,9 +2,43 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+include_rtems_scoredir = $(includedir)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
+
+## We only build multiprocessing related files if HAS_MP was defined
+MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
+
+STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
+ rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
+ rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
+ rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
+ rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
+ rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
+ rtems/score/wkspace.inl
+
+if HAS_MP
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+else
+I_FILES = $(STD_I_FILES)
+endif
+
+if INLINE
+include_rtems_score_HEADERS = $(I_FILES)
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/inline/rtems/Makefile.am b/c/src/exec/score/inline/rtems/Makefile.am
deleted file mode 100644
index 7a6308aaf5..0000000000
--- a/c/src/exec/score/inline/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = score
-
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.am b/c/src/exec/score/inline/rtems/score/Makefile.am
deleted file mode 100644
index 785116b55e..0000000000
--- a/c/src/exec/score/inline/rtems/score/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-## We only build multiprocessing related files if HAS_MP was defined
-MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
-
-STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
- heap.inl isr.inl object.inl priority.inl stack.inl states.inl \
- sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
- wkspace.inl
-
-if HAS_MP
-I_FILES = $(STD_I_FILES) $(MP_I_FILES)
-else
-I_FILES = $(STD_I_FILES)
-endif
-
-include_rtems_score_HEADERS = $(I_FILES)
-
-if INLINE
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
- $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
-
-$(PROJECT_INCLUDE)/rtems/score:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl
- $(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/macros/Makefile.am b/c/src/exec/score/macros/Makefile.am
index f60df4f6b8..05c8ecc5aa 100644
--- a/c/src/exec/score/macros/Makefile.am
+++ b/c/src/exec/score/macros/Makefile.am
@@ -2,11 +2,43 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
-EXTRA_DIST = README
+include_rtems_scoredir = $(includedir)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
+
+## We only build multiprocessing related files if HAS_MP was defined
+MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
+
+STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
+ rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
+ rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
+ rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
+ rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
+ rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
+ rtems/score/wkspace.inl
+
+if HAS_MP
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+else
+I_FILES = $(STD_I_FILES)
+endif
+
+if MACROS
+include_rtems_score_HEADERS = $(I_FILES)
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/macros/rtems/Makefile.am b/c/src/exec/score/macros/rtems/Makefile.am
deleted file mode 100644
index 7a6308aaf5..0000000000
--- a/c/src/exec/score/macros/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = score
-
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.am b/c/src/exec/score/macros/rtems/score/Makefile.am
deleted file mode 100644
index 9779795941..0000000000
--- a/c/src/exec/score/macros/rtems/score/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-## We only build multiprocessing related files if HAS_MP was defined
-MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
-
-STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
- heap.inl isr.inl object.inl priority.inl stack.inl states.inl \
- sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
- wkspace.inl
-
-I_FILES = $(STD_I_FILES) $(MP_I_FILES)
-
-if MACROS
-if HAS_MP
-include_rtems_score_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
-else
-include_rtems_score_HEADERS = $(STD_I_FILES)
-endif
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
- $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
-
-$(PROJECT_INCLUDE)/rtems/score:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/score/%.inl: %.inl
- $(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(I_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index 6eb5467d98..27a536abc1 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,4 +1,17 @@
+2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/rtems/Makefile.am: Remove.
+ * include/rtems/Makefile.am: Remove.
+ * include/Makefile.am: Handle subdirs, require automake-1.5.
+ * macros/rtems/Makefile.am: Remove.
+ * macros/rtems/score/Makefile.am: Remove.
+ * macros/Makefile.am: Handle subdirs, require automake-1.5.
+ * inline/rtems/Makefile.am: Remove.
+ * inline/rtems/score/Makefile.am: Remove.
+ * inline/Makefile.am: Handle subdirs, require automake-1.5.
+ * Makefile.am: require automake-1.5
+
2001-09-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/score/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 411e001881..9eee483746 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -2,7 +2,7 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = include inline macros cpu src
diff --git a/cpukit/score/include/Makefile.am b/cpukit/score/include/Makefile.am
index 0c97211587..f8b9edd4e1 100644
--- a/cpukit/score/include/Makefile.am
+++ b/cpukit/score/include/Makefile.am
@@ -2,9 +2,64 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+include_rtemsdir = $(includedir)/rtems
+
+$(PROJECT_INCLUDE)/rtems:
+ @$(mkinstalldirs) $@
+
+include_rtems_HEADERS = rtems/debug.h rtems/system.h rtems/seterr.h
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
+ $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+include_rtems_scoredir = $(includedir)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
+
+# We only build multiprocessing related files if HAS_MP was defined
+MP_H_FILES = rtems/score/mpci.h rtems/score/mppkt.h rtems/score/objectmp.h \
+ rtems/score/threadmp.h
+
+# H_FILES that get installed in the rtems/score subdirectoy
+STD_H_FILES = rtems/score/address.h rtems/score/apiext.h \
+ rtems/score/bitfield.h rtems/score/chain.h rtems/score/context.h \
+ rtems/score/copyrt.h rtems/score/coremsg.h rtems/score/coremutex.h \
+ rtems/score/coresem.h rtems/score/heap.h rtems/score/interr.h \
+ rtems/score/isr.h rtems/score/object.h rtems/score/priority.h \
+ rtems/score/stack.h rtems/score/states.h rtems/score/sysstate.h \
+ rtems/score/thread.h rtems/score/threadq.h rtems/score/tod.h \
+ rtems/score/tqdata.h rtems/score/userext.h rtems/score/watchdog.h \
+ rtems/score/wkspace.h
+
+if HAS_MP
+include_rtems_score_HEADERS = $(STD_H_FILES) $(MP_H_FILES) rtems/score/cpuopts.h
+else
+include_rtems_score_HEADERS = $(STD_H_FILES) rtems/score/cpuopts.h
+endif
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+# make the cpu dependent options file
+# FIXME: We are exporting a config-header here, which is a bad idea in
+# general
+rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
+ @echo "/* target cpu dependent options file */" >$@
+ @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
+ @echo >>$@
+ @echo "#ifndef __CPU_OPTIONS_h" >>$@
+ @echo "#define __CPU_OPTIONS_h" >>$@
+ @echo >>$@
+ @cat cpuopts-tmp.h >>$@
+ @echo >>$@
+ @echo "#endif" >>$@
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/inline/Makefile.am b/cpukit/score/inline/Makefile.am
index 0c97211587..1bd2cecc7f 100644
--- a/cpukit/score/inline/Makefile.am
+++ b/cpukit/score/inline/Makefile.am
@@ -2,9 +2,43 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+include_rtems_scoredir = $(includedir)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
+
+## We only build multiprocessing related files if HAS_MP was defined
+MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
+
+STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
+ rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
+ rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
+ rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
+ rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
+ rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
+ rtems/score/wkspace.inl
+
+if HAS_MP
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+else
+I_FILES = $(STD_I_FILES)
+endif
+
+if INLINE
+include_rtems_score_HEADERS = $(I_FILES)
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES)
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/macros/Makefile.am b/cpukit/score/macros/Makefile.am
index f60df4f6b8..05c8ecc5aa 100644
--- a/cpukit/score/macros/Makefile.am
+++ b/cpukit/score/macros/Makefile.am
@@ -2,11 +2,43 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
-EXTRA_DIST = README
+include_rtems_scoredir = $(includedir)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
+
+## We only build multiprocessing related files if HAS_MP was defined
+MP_I_FILES = rtems/score/mppkt.inl rtems/score/objectmp.inl rtems/score/threadmp.inl
+
+STD_I_FILES = rtems/score/address.inl rtems/score/chain.inl \
+ rtems/score/coremsg.inl rtems/score/coremutex.inl rtems/score/coresem.inl \
+ rtems/score/heap.inl rtems/score/isr.inl rtems/score/object.inl \
+ rtems/score/priority.inl rtems/score/stack.inl rtems/score/states.inl \
+ rtems/score/sysstate.inl rtems/score/thread.inl rtems/score/tod.inl \
+ rtems/score/tqdata.inl rtems/score/userext.inl rtems/score/watchdog.inl \
+ rtems/score/wkspace.inl
+
+if HAS_MP
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+else
+I_FILES = $(STD_I_FILES)
+endif
+
+if MACROS
+include_rtems_score_HEADERS = $(I_FILES)
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
+ $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = $(STD_I_FILES) $(MP_I_FILES) README
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am