3 files changed, 20 insertions, 42 deletions
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