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

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

6 files changed, 27 insertions, 17 deletions

diff --git a/c/src/exec/rtems/ChangeLog b/c/src/exec/rtems/ChangeLog
index a5e12514be..7cf403df32 100644
--- a/c/src/exec/rtems/ChangeLog
+++ b/c/src/exec/rtems/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/Makefile.am, include/rtems/rtems/Makefile.am,
+	inline/rtems/rtems/Makefile.am, macros/rtems/rtems/Makefile.am, 
+	rtems/optman/Makefile.am:
+	Apply include_*HEADERS instead of H_FILES.
+
 2001-01-22	Michael Hamel <mhamel@adi.co.nz>
 
 	* include/rtems.h, src/signalcatch.c: Modifications to make
diff --git a/c/src/exec/rtems/include/Makefile.am b/c/src/exec/rtems/include/Makefile.am
index 09e318db3b..a17f777909 100644
--- a/c/src/exec/rtems/include/Makefile.am
+++ b/c/src/exec/rtems/include/Makefile.am
@@ -4,12 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = rtems.h
-
-noinst_HEADERS = $(H_FILES)
+include_HEADERS = rtems.h
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE) \
-    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.am b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
index fe27329924..3ba9e701d9 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
@@ -4,6 +4,8 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+
 ## We only build multiprocessing related files if HAS_MP was defined
 MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h signalmp.h \
     taskmp.h
@@ -13,15 +15,13 @@ STD_H_FILES = asr.h attr.h cache.h clock.h config.h dpmem.h event.h \
     rtemsapi.h sem.h signal.h status.h support.h tasks.h timer.h types.h
 
 if HAS_MP
-H_FILES = $(STD_H_FILES) $(MP_H_FILES)
+include_rtems_rtems_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
 else
-H_FILES = $(STD_H_FILES)
+include_rtems_rtems_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
 endif
 
-noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
-
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+    $(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems/rtems:
 	@$(mkinstalldirs) $@
diff --git a/c/src/exec/rtems/inline/rtems/rtems/Makefile.am b/c/src/exec/rtems/inline/rtems/rtems/Makefile.am
index b8b787a40e..b0baa5694c 100644
--- a/c/src/exec/rtems/inline/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/inline/rtems/rtems/Makefile.am
@@ -4,15 +4,17 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if INLINE
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+
 I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
     modes.inl options.inl part.inl ratemon.inl region.inl sem.inl status.inl \
     support.inl tasks.inl timer.inl
 
-noinst_HEADERS = $(I_FILES)
+if INLINE
+include_rtems_rtems_HEADERS = $(I_FILES)
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
-    $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+    $(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems/rtems:
 	@$(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/rtems/macros/rtems/rtems/Makefile.am b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
index dacf3011fe..e29786d591 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
@@ -4,16 +4,17 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+
 I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
     modes.inl options.inl part.inl ratemon.inl region.inl sem.inl status.inl \
     support.inl tasks.inl timer.inl
 
-noinst_HEADERS = $(I_FILES)
-
 if MACROS
+include_rtems_rtems_HEADERS = $(I_FILES)
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
-    $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+    $(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems/rtems:
 	@$(mkinstalldirs) $@
@@ -23,4 +24,6 @@ endif
 
 all-local: $(PREINSTALL_FILES)
 
+EXTRA_DIST = $(I_FILES)
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/rtems/optman/Makefile.am b/c/src/exec/rtems/optman/Makefile.am
index dded992530..1126155c87 100644
--- a/c/src/exec/rtems/optman/Makefile.am
+++ b/c/src/exec/rtems/optman/Makefile.am
@@ -24,8 +24,6 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 # (OPTIONAL) Add local stuff here using +=
 #
 
-ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
-
 all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(PGMS)