summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:30:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:30:22 +0000
commit5be35eecb438fb7c18d979215cce927a2e863996 (patch)
treeeeb4bef07ac28ce7cfd74865ced48ac358dce01c /c
parent2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-5be35eecb438fb7c18d979215cce927a2e863996.tar.bz2
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/sys/Makefile.am: Remove. * include/rtems/Makefile.am: Remove. * include/rtems/posix/Makefile.am: Remove. * include/Makefile.am: Handle subdirs. * inline/rtems/Makefile.am: Remove. * inline/rtems/posix/Makefile.am: Remove. * inline/Makefile.am: Handle subdirs. * macros/rtems/Makefile.am: Remove. * macros/rtems/posix/Makefile.am: Remove. * macros/Makefile.am: Handle subdirs. * configure.ac: Reflect changes above.
Diffstat (limited to '')
-rw-r--r--c/src/exec/posix/ChangeLog14
-rw-r--r--c/src/exec/posix/configure.ac7
-rw-r--r--c/src/exec/posix/include/Makefile.am55
-rw-r--r--c/src/exec/posix/include/rtems/Makefile.am10
-rw-r--r--c/src/exec/posix/include/rtems/posix/Makefile.am35
-rw-r--r--c/src/exec/posix/include/sys/Makefile.am21
-rw-r--r--c/src/exec/posix/inline/Makefile.am23
-rw-r--r--c/src/exec/posix/inline/rtems/Makefile.am10
-rw-r--r--c/src/exec/posix/inline/rtems/posix/Makefile.am29
-rw-r--r--c/src/exec/posix/macros/Makefile.am23
-rw-r--r--c/src/exec/posix/macros/rtems/Makefile.am10
-rw-r--r--c/src/exec/posix/macros/rtems/posix/Makefile.am28
-rw-r--r--cpukit/posix/ChangeLog14
-rw-r--r--cpukit/posix/configure.ac7
-rw-r--r--cpukit/posix/include/Makefile.am55
-rw-r--r--cpukit/posix/inline/Makefile.am23
-rw-r--r--cpukit/posix/macros/Makefile.am23
17 files changed, 202 insertions, 185 deletions
diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog
index 5c5e9e2424..ca0b4623c9 100644
--- a/c/src/exec/posix/ChangeLog
+++ b/c/src/exec/posix/ChangeLog
@@ -1,3 +1,17 @@
+2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/sys/Makefile.am: Remove.
+ * include/rtems/Makefile.am: Remove.
+ * include/rtems/posix/Makefile.am: Remove.
+ * include/Makefile.am: Handle subdirs.
+ * inline/rtems/Makefile.am: Remove.
+ * inline/rtems/posix/Makefile.am: Remove.
+ * inline/Makefile.am: Handle subdirs.
+ * macros/rtems/Makefile.am: Remove.
+ * macros/rtems/posix/Makefile.am: Remove.
+ * macros/Makefile.am: Handle subdirs.
+ * configure.ac: Reflect changes above.
+
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.
diff --git a/c/src/exec/posix/configure.ac b/c/src/exec/posix/configure.ac
index 3aa1f2e39f..a19b0be67f 100644
--- a/c/src/exec/posix/configure.ac
+++ b/c/src/exec/posix/configure.ac
@@ -53,15 +53,8 @@ AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_FILES([Makefile
src/Makefile
include/Makefile
-include/sys/Makefile
-include/rtems/Makefile
-include/rtems/posix/Makefile
optman/Makefile
inline/Makefile
-inline/rtems/Makefile
-inline/rtems/posix/Makefile
macros/Makefile
-macros/rtems/Makefile
-macros/rtems/posix/Makefile
])
AC_OUTPUT
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am
index f01d9416cc..0b9e026a7a 100644
--- a/c/src/exec/posix/include/Makefile.am
+++ b/c/src/exec/posix/include/Makefile.am
@@ -2,8 +2,19 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
+$(PROJECT_INCLUDE):
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/sys:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/posix:
+ @$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+# include
noinst_HEADERS = devctl.h intr.h
include_HEADERS = sched.h aio.h mqueue.h semaphore.h
@@ -11,16 +22,44 @@ include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-$(PROJECT_INCLUDE):
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
+# sys
-all-local: $(PREINSTALL_FILES)
+include_sysdir = $(includedir)/sys
+
+include_sys_HEADERS = sys/utsname.h
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
+ $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+# rtems/posix
+
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+MP_H_FILES = rtems/posix/condmp.h rtems/posix/mqueuemp.h rtems/posix/mutexmp.h \
+ rtems/posix/pthreadmp.h rtems/posix/semaphoremp.h
-SUBDIRS = rtems sys
+STD_H_FILES = rtems/posix/cancel.h rtems/posix/cond.h rtems/posix/config.h \
+ rtems/posix/key.h rtems/posix/mqueue.h rtems/posix/mutex.h \
+ rtems/posix/posixapi.h rtems/posix/priority.h rtems/posix/psignal.h \
+ rtems/posix/pthread.h rtems/posix/ptimer.h rtems/posix/semaphore.h \
+ rtems/posix/threadsup.h rtems/posix/time.h rtems/posix/timer.h \
+ $(MP_H_FILES)
+
+noinst_HEADERS += rtems/posix/intr.h rtems/posix/threadsup.h
+
+if HAS_MP
+include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
+else
+include_rtems_posix_HEADERS = $(STD_H_FILES)
+endif
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+## General
+
+all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(noinst_HEADERS)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/rtems/Makefile.am b/c/src/exec/posix/include/rtems/Makefile.am
deleted file mode 100644
index abe9f5bf3f..0000000000
--- a/c/src/exec/posix/include/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = posix
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.am b/c/src/exec/posix/include/rtems/posix/Makefile.am
deleted file mode 100644
index 0af8840c91..0000000000
--- a/c/src/exec/posix/include/rtems/posix/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_posixdir = $(includedir)/rtems/posix
-
-MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
-
-STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
- priority.h psignal.h pthread.h ptimer.h semaphore.h threadsup.h time.h \
- timer.h $(MP_H_FILES)
-
-noinst_HEADERS = intr.h threadsup.h
-
-if HAS_MP
-include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
-else
-include_rtems_posix_HEADERS = $(STD_H_FILES)
-endif
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
- $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
-
-$(PROJECT_INCLUDE)/rtems/posix:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/posix/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(noinst_HEADERS)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/sys/Makefile.am b/c/src/exec/posix/include/sys/Makefile.am
deleted file mode 100644
index 514802a651..0000000000
--- a/c/src/exec/posix/include/sys/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_sysdir = $(includedir)/sys
-
-include_sys_HEADERS = utsname.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/sys \
- $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
-
-$(PROJECT_INCLUDE)/sys:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/sys/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/inline/Makefile.am b/c/src/exec/posix/inline/Makefile.am
index 32269fcdcd..ad102038a2 100644
--- a/c/src/exec/posix/inline/Makefile.am
+++ b/c/src/exec/posix/inline/Makefile.am
@@ -2,9 +2,26 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+$(PROJECT_INCLUDE)/rtems/posix:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if INLINE
+noinst_HEADERS = rtems/posix/intr.inl
+include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
+ rtems/posix/mqueue.inl rtems/posix/mutex.inl \
+ rtems/posix/pthread.inl rtems/posix/priority.inl \
+ rtems/posix/semaphore.inl rtems/posix/timer.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/inline/rtems/Makefile.am b/c/src/exec/posix/inline/rtems/Makefile.am
deleted file mode 100644
index abe9f5bf3f..0000000000
--- a/c/src/exec/posix/inline/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = posix
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am
deleted file mode 100644
index e9ecd98875..0000000000
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_posixdir = $(includedir)/rtems/posix
-
-noinst_HEADERS = intr.inl
-I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
- semaphore.inl timer.inl
-
-if INLINE
-include_rtems_posix_HEADERS = $(I_FILES)
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
- $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
-
-$(PROJECT_INCLUDE)/rtems/posix:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
- $(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = intr.inl $(I_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/macros/Makefile.am b/c/src/exec/posix/macros/Makefile.am
index 32269fcdcd..0465f3b814 100644
--- a/c/src/exec/posix/macros/Makefile.am
+++ b/c/src/exec/posix/macros/Makefile.am
@@ -2,9 +2,26 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+$(PROJECT_INCLUDE)/rtems/posix:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if MACROS
+noinst_HEADERS = rtems/posix/intr.inl
+include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
+ rtems/posix/mqueue.inl rtems/posix/mutex.inl \
+ rtems/posix/pthread.inl rtems/posix/priority.inl \
+ rtems/posix/semaphore.inl rtems/posix/timer.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/macros/rtems/Makefile.am b/c/src/exec/posix/macros/rtems/Makefile.am
deleted file mode 100644
index abe9f5bf3f..0000000000
--- a/c/src/exec/posix/macros/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = posix
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/macros/rtems/posix/Makefile.am b/c/src/exec/posix/macros/rtems/posix/Makefile.am
deleted file mode 100644
index 5f3e2ad701..0000000000
--- a/c/src/exec/posix/macros/rtems/posix/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_posixdir = $(includedir)/rtems/posix
-
-I_FILES = cond.inl intr.inl key.inl mqueue.inl mutex.inl priority.inl \
- pthread.inl semaphore.inl timer.inl
-
-if MACROS
-include_rtems_posix_HEADERS = $(I_FILES)
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
- $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/rtems/posix/%)
-
-$(PROJECT_INCLUDE)/rtems/posix:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/posix/%.inl: %.inl
- $(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(I_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 5c5e9e2424..ca0b4623c9 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,17 @@
+2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/sys/Makefile.am: Remove.
+ * include/rtems/Makefile.am: Remove.
+ * include/rtems/posix/Makefile.am: Remove.
+ * include/Makefile.am: Handle subdirs.
+ * inline/rtems/Makefile.am: Remove.
+ * inline/rtems/posix/Makefile.am: Remove.
+ * inline/Makefile.am: Handle subdirs.
+ * macros/rtems/Makefile.am: Remove.
+ * macros/rtems/posix/Makefile.am: Remove.
+ * macros/Makefile.am: Handle subdirs.
+ * configure.ac: Reflect changes above.
+
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.
diff --git a/cpukit/posix/configure.ac b/cpukit/posix/configure.ac
index 3aa1f2e39f..a19b0be67f 100644
--- a/cpukit/posix/configure.ac
+++ b/cpukit/posix/configure.ac
@@ -53,15 +53,8 @@ AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_FILES([Makefile
src/Makefile
include/Makefile
-include/sys/Makefile
-include/rtems/Makefile
-include/rtems/posix/Makefile
optman/Makefile
inline/Makefile
-inline/rtems/Makefile
-inline/rtems/posix/Makefile
macros/Makefile
-macros/rtems/Makefile
-macros/rtems/posix/Makefile
])
AC_OUTPUT
diff --git a/cpukit/posix/include/Makefile.am b/cpukit/posix/include/Makefile.am
index f01d9416cc..0b9e026a7a 100644
--- a/cpukit/posix/include/Makefile.am
+++ b/cpukit/posix/include/Makefile.am
@@ -2,8 +2,19 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
+$(PROJECT_INCLUDE):
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/sys:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/posix:
+ @$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: %.h
+ $(INSTALL_DATA) $< $@
+
+# include
noinst_HEADERS = devctl.h intr.h
include_HEADERS = sched.h aio.h mqueue.h semaphore.h
@@ -11,16 +22,44 @@ include_HEADERS = sched.h aio.h mqueue.h semaphore.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-$(PROJECT_INCLUDE):
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
+# sys
-all-local: $(PREINSTALL_FILES)
+include_sysdir = $(includedir)/sys
+
+include_sys_HEADERS = sys/utsname.h
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
+ $(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+# rtems/posix
+
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+MP_H_FILES = rtems/posix/condmp.h rtems/posix/mqueuemp.h rtems/posix/mutexmp.h \
+ rtems/posix/pthreadmp.h rtems/posix/semaphoremp.h
-SUBDIRS = rtems sys
+STD_H_FILES = rtems/posix/cancel.h rtems/posix/cond.h rtems/posix/config.h \
+ rtems/posix/key.h rtems/posix/mqueue.h rtems/posix/mutex.h \
+ rtems/posix/posixapi.h rtems/posix/priority.h rtems/posix/psignal.h \
+ rtems/posix/pthread.h rtems/posix/ptimer.h rtems/posix/semaphore.h \
+ rtems/posix/threadsup.h rtems/posix/time.h rtems/posix/timer.h \
+ $(MP_H_FILES)
+
+noinst_HEADERS += rtems/posix/intr.h rtems/posix/threadsup.h
+
+if HAS_MP
+include_rtems_posix_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
+else
+include_rtems_posix_HEADERS = $(STD_H_FILES)
+endif
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix \
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+## General
+
+all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(noinst_HEADERS)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/posix/inline/Makefile.am b/cpukit/posix/inline/Makefile.am
index 32269fcdcd..ad102038a2 100644
--- a/cpukit/posix/inline/Makefile.am
+++ b/cpukit/posix/inline/Makefile.am
@@ -2,9 +2,26 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+$(PROJECT_INCLUDE)/rtems/posix:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if INLINE
+noinst_HEADERS = rtems/posix/intr.inl
+include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
+ rtems/posix/mqueue.inl rtems/posix/mutex.inl \
+ rtems/posix/pthread.inl rtems/posix/priority.inl \
+ rtems/posix/semaphore.inl rtems/posix/timer.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/posix/macros/Makefile.am b/cpukit/posix/macros/Makefile.am
index 32269fcdcd..0465f3b814 100644
--- a/cpukit/posix/macros/Makefile.am
+++ b/cpukit/posix/macros/Makefile.am
@@ -2,9 +2,26 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_posixdir = $(includedir)/rtems/posix
+
+$(PROJECT_INCLUDE)/rtems/posix:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if MACROS
+noinst_HEADERS = rtems/posix/intr.inl
+include_rtems_posix_HEADERS = rtems/posix/cond.inl rtems/posix/key.inl \
+ rtems/posix/mqueue.inl rtems/posix/mutex.inl \
+ rtems/posix/pthread.inl rtems/posix/priority.inl \
+ rtems/posix/semaphore.inl rtems/posix/timer.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/posix \
+ $(include_rtems_posix_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am