4 files changed, 47 insertions, 74 deletions
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