2 files changed, 16 insertions, 25 deletions
diff --git a/c/src/exec/sapi/inline/Makefile.am b/c/src/exec/sapi/inline/Makefile.am
index 0c97211587..55115aa33d 100644
--- a/c/src/exec/sapi/inline/Makefile.am
+++ b/c/src/exec/sapi/inline/Makefile.am
@@ -2,9 +2,22 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
 
-SUBDIRS = rtems
+include_rtemsdir = $(includedir)/rtems
+
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+	$(INSTALL_DATA) $< $@
+
+if INLINE
+include_rtems_HEADERS = rtems/extension.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
+    $(include_rtems_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/sapi/inline/rtems/Makefile.am b/c/src/exec/sapi/inline/rtems/Makefile.am
deleted file mode 100644
index 36a30b5bc5..0000000000
--- a/c/src/exec/sapi/inline/rtems/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-include_rtemsdir = $(includedir)/rtems
-
-if INLINE
-include_rtems_HEADERS = extension.inl
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
-    $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
-
-$(PROJECT_INCLUDE)/rtems:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/%.inl: %.inl
-	$(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../automake/local.am