2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* include/Makefile.am, include/itronsys/Makefile.am,
	include/rtems/itron/Makefile.am, inline/rtems/itron/Makefile.am,
	macros/rtems/itron/Makefile.am:
	Apply include_*HEADERS instead of H_FILES.

6 files changed, 31 insertions, 18 deletions

diff --git a/c/src/exec/itron/ChangeLog b/c/src/exec/itron/ChangeLog
index 1c4cb9a4bc..7421befb1f 100644
--- a/c/src/exec/itron/ChangeLog
+++ b/c/src/exec/itron/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/Makefile.am, include/itronsys/Makefile.am,
+	include/rtems/itron/Makefile.am, inline/rtems/itron/Makefile.am,
+	macros/rtems/itron/Makefile.am:
+	Apply include_*HEADERS instead of H_FILES.
+
 2001-01-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.in: Add src/config.h
diff --git a/c/src/exec/itron/include/Makefile.am b/c/src/exec/itron/include/Makefile.am
index 66bdf8c9e7..14695128b7 100644
--- a/c/src/exec/itron/include/Makefile.am
+++ b/c/src/exec/itron/include/Makefile.am
@@ -4,12 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = itron.h
-
-noinst_HEADERS = $(H_FILES)
+include_HEADERS = itron.h
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE) \
-    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
diff --git a/c/src/exec/itron/include/itronsys/Makefile.am b/c/src/exec/itron/include/itronsys/Makefile.am
index 2aa2a0b0ea..e0ca56dfaa 100644
--- a/c/src/exec/itron/include/itronsys/Makefile.am
+++ b/c/src/exec/itron/include/itronsys/Makefile.am
@@ -4,13 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = 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
+include_itronsysdir = $(includedir)/itronsys
 
-noinst_HEADERS = $(H_FILES)
+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 \
-    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%)
+    $(include_itronsys_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%)
 
 $(PROJECT_INCLUDE)/itronsys:
 	@$(mkinstalldirs) $@
diff --git a/c/src/exec/itron/include/rtems/itron/Makefile.am b/c/src/exec/itron/include/rtems/itron/Makefile.am
index 96053cfb9a..bdd1049a04 100644
--- a/c/src/exec/itron/include/rtems/itron/Makefile.am
+++ b/c/src/exec/itron/include/rtems/itron/Makefile.am
@@ -4,14 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \
+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
 
-noinst_HEADERS = $(H_FILES)
-
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
+    $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
 
 $(PROJECT_INCLUDE)/rtems/itron:
 	@$(mkinstalldirs) $@
diff --git a/c/src/exec/itron/inline/rtems/itron/Makefile.am b/c/src/exec/itron/inline/rtems/itron/Makefile.am
index f5368fff77..e911370a80 100644
--- a/c/src/exec/itron/inline/rtems/itron/Makefile.am
+++ b/c/src/exec/itron/inline/rtems/itron/Makefile.am
@@ -4,15 +4,17 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if INLINE
+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
 
-noinst_HEADERS = $(I_FILES)
+if INLINE
+include_rtems_itron_HEADERS = $(I_FILES)
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
-    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
+    $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
 
 $(PROJECT_INCLUDE)/rtems/itron:
 	@$(mkinstalldirs) $@
@@ -22,4 +24,6 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
+EXTRA_DIST = $(I_FILES)
+
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/macros/rtems/itron/Makefile.am b/c/src/exec/itron/macros/rtems/itron/Makefile.am
index 45bee17d6f..3e62ebeac7 100644
--- a/c/src/exec/itron/macros/rtems/itron/Makefile.am
+++ b/c/src/exec/itron/macros/rtems/itron/Makefile.am
@@ -4,15 +4,17 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if MACROS
+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
 
-noinst_HEADERS = $(I_FILES)
+if MACROS
+include_rtems_itron_HEADERS = $(I_FILES)
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
-    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%)
+    $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
 
 $(PROJECT_INCLUDE)/rtems/itron:
 	@$(mkinstalldirs) $@
@@ -22,4 +24,6 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
+EXTRA_DIST = $(I_FILES)
+
 include $(top_srcdir)/../../../../automake/local.am