4 files changed, 42 insertions, 65 deletions
diff --git a/c/src/exec/itron/include/Makefile.am b/c/src/exec/itron/include/Makefile.am
index dd02c86c83..206ce956db 100644
--- a/c/src/exec/itron/include/Makefile.am
+++ b/c/src/exec/itron/include/Makefile.am
@@ -2,21 +2,55 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
+
+$(PROJECT_INCLUDE):
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/itronsys:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/itron:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%: %
+	$(INSTALL_DATA) $< $@
+
+## include
 
 include_HEADERS = itron.h
 
 PREINSTALL_FILES = $(PROJECT_INCLUDE) \
     $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
-$(PROJECT_INCLUDE):
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
+## itronsys
 
-all-local: $(PREINSTALL_FILES)
+include_itronsysdir = $(includedir)/itronsys
+
+include_itronsys_HEADERS = itronsys/eventflags.h itronsys/fmempool.h \
+    itronsys/intr.h itronsys/mbox.h itronsys/msgbuffer.h itronsys/network.h \
+    itronsys/port.h itronsys/semaphore.h itronsys/status.h itronsys/sysmgmt.h \
+    itronsys/task.h itronsys/time.h itronsys/types.h itronsys/vmempool.h
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \
+    $(include_itronsys_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+EXTRA_DIST = itronsys/README
 
-SUBDIRS = rtems itronsys
+## rtems/itron
+include_rtems_itrondir = $(includedir)/rtems/itron
+
+include_rtems_itron_HEADERS = rtems/itron/config.h rtems/itron/eventflags.h \
+    rtems/itron/fmempool.h rtems/itron/intr.h rtems/itron/itronapi.h \
+    rtems/itron/mbox.h rtems/itron/msgbuffer.h rtems/itron/network.h \
+    rtems/itron/object.h rtems/itron/port.h rtems/itron/semaphore.h \
+    rtems/itron/sysmgmt.h rtems/itron/task.h rtems/itron/time.h \
+    rtems/itron/vmempool.h
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
+    $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+EXTRA_DIST += rtems/itron/README
+
+## General
+all-local: $(PREINSTALL_FILES)
 
-include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/include/itronsys/Makefile.am b/c/src/exec/itron/include/itronsys/Makefile.am
deleted file mode 100644
index c26937d18e..0000000000
--- a/c/src/exec/itron/include/itronsys/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_itronsysdir = $(includedir)/itronsys
-
-include_itronsys_HEADERS = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h port.h \
-    semaphore.h status.h sysmgmt.h task.h time.h types.h vmempool.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/itronsys \
-    $(include_itronsys_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%)
-
-$(PROJECT_INCLUDE)/itronsys:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/itronsys/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/include/rtems/Makefile.am b/c/src/exec/itron/include/rtems/Makefile.am
deleted file mode 100644
index d6766c8306..0000000000
--- a/c/src/exec/itron/include/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/include/rtems/itron/Makefile.am b/c/src/exec/itron/include/rtems/itron/Makefile.am
deleted file mode 100644
index d3bb7fc382..0000000000
--- a/c/src/exec/itron/include/rtems/itron/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_itrondir = $(includedir)/rtems/itron
-
-include_rtems_itron_HEADERS = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \
-    msgbuffer.h network.h object.h port.h semaphore.h sysmgmt.h task.h \
-    time.h vmempool.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
-    $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
-
-$(PROJECT_INCLUDE)/rtems/itron:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/itron/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = README
-
-include $(top_srcdir)/../../../../automake/local.am