3 files changed, 20 insertions, 42 deletions
diff --git a/c/src/exec/itron/inline/Makefile.am b/c/src/exec/itron/inline/Makefile.am
index 32269fcdcd..a9f5a25c1f 100644
--- a/c/src/exec/itron/inline/Makefile.am
+++ b/c/src/exec/itron/inline/Makefile.am
@@ -2,9 +2,26 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
 
-SUBDIRS = rtems
+include_rtems_itrondir = $(includedir)/rtems/itron
+
+$(PROJECT_INCLUDE)/rtems/itron:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+	$(INSTALL_DATA) $< $@
+
+if INLINE
+include_rtems_itron_HEADERS = rtems/itron/eventflags.inl \
+    rtems/itron/fmempool.inl rtems/itron/intr.inl rtems/itron/mbox.inl \
+    rtems/itron/msgbuffer.inl rtems/itron/network.inl rtems/itron/port.inl \
+    rtems/itron/semaphore.inl rtems/itron/sysmgmt.inl rtems/itron/task.inl \
+    rtems/itron/time.inl rtems/itron/vmempool.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
+    $(include_rtems_itron_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/itron/inline/rtems/Makefile.am b/c/src/exec/itron/inline/rtems/Makefile.am
deleted file mode 100644
index d6766c8306..0000000000
--- a/c/src/exec/itron/inline/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = itron
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/inline/rtems/itron/Makefile.am b/c/src/exec/itron/inline/rtems/itron/Makefile.am
deleted file mode 100644
index 38b178c886..0000000000
--- a/c/src/exec/itron/inline/rtems/itron/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_itrondir = $(includedir)/rtems/itron
-
-I_FILES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \
-    network.inl port.inl semaphore.inl sysmgmt.inl task.inl time.inl \
-    vmempool.inl
-
-if INLINE
-include_rtems_itron_HEADERS = $(I_FILES)
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
-    $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
-
-$(PROJECT_INCLUDE)/rtems/itron:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/itron/%.inl: %.inl
-	$(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(I_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am