From 3ebf5df3c6ba7f876c637b630bfb1d9f70b79dc8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 Feb 2001 18:32:28 +0000 Subject: 2001-02-03 Ralf Corsepius * include/Makefile.am, include/rtems/Makefile.am, inline/rtems/Makefile.am, macros/rtems/Makefile.am: Apply include_*HEADERS instead of H_FILES. --- c/src/exec/sapi/ChangeLog | 6 ++++++ c/src/exec/sapi/include/Makefile.am | 6 ++---- c/src/exec/sapi/include/rtems/Makefile.am | 8 ++++---- c/src/exec/sapi/inline/rtems/Makefile.am | 7 +++---- c/src/exec/sapi/macros/rtems/Makefile.am | 10 +++++++--- 5 files changed, 22 insertions(+), 15 deletions(-) (limited to 'c/src/exec') diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog index c55f627b96..fd0543b2cd 100644 --- a/c/src/exec/sapi/ChangeLog +++ b/c/src/exec/sapi/ChangeLog @@ -1,3 +1,9 @@ +2001-02-03 Ralf Corsepius + + * include/Makefile.am, include/rtems/Makefile.am, + inline/rtems/Makefile.am, macros/rtems/Makefile.am: + Apply include_*HEADERS instead of H_FILES. + 2001-01-28 Ralf Corsepius * include/confdefs.h: define CONFIGURE_NEWLIB_EXTENSION 0 if not diff --git a/c/src/exec/sapi/include/Makefile.am b/c/src/exec/sapi/include/Makefile.am index d206ebc214..0b01f14637 100644 --- a/c/src/exec/sapi/include/Makefile.am +++ b/c/src/exec/sapi/include/Makefile.am @@ -4,12 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = confdefs.h - -noinst_HEADERS = $(H_FILES) +include_HEADERS = confdefs.h PREINSTALL_FILES += $(PROJECT_INCLUDE) \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ diff --git a/c/src/exec/sapi/include/rtems/Makefile.am b/c/src/exec/sapi/include/rtems/Makefile.am index 0483ede4c3..f7053db1f4 100644 --- a/c/src/exec/sapi/include/rtems/Makefile.am +++ b/c/src/exec/sapi/include/rtems/Makefile.am @@ -4,13 +4,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = config.h directives.h extension.h fatal.h init.h io.h mptables.h \ - sptables.h +include_rtemsdir = $(includedir)/rtems -noinst_HEADERS = $(H_FILES) +include_rtems_HEADERS = config.h directives.h extension.h fatal.h init.h io.h mptables.h \ + sptables.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/exec/sapi/inline/rtems/Makefile.am b/c/src/exec/sapi/inline/rtems/Makefile.am index cdc59dd96a..2b4f5debb5 100644 --- a/c/src/exec/sapi/inline/rtems/Makefile.am +++ b/c/src/exec/sapi/inline/rtems/Makefile.am @@ -3,14 +3,13 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 +include_rtemsdir = $(includedir)/rtems if INLINE -I_FILES = extension.inl - -noinst_HEADERS = $(I_FILES) +include_rtems_HEADERS = extension.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ diff --git a/c/src/exec/sapi/macros/rtems/Makefile.am b/c/src/exec/sapi/macros/rtems/Makefile.am index 857ad0615c..15bd97e82a 100644 --- a/c/src/exec/sapi/macros/rtems/Makefile.am +++ b/c/src/exec/sapi/macros/rtems/Makefile.am @@ -4,13 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 -I_FILES = extension.inl +include_rtemsdir = $(includedir)/rtems -noinst_HEADERS = $(I_FILES) +I_FILES = extension.inl if MACROS +include_rtems_HEADERS = $(I_FILES) + PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ @@ -20,4 +22,6 @@ endif all-local: $(PREINSTALL_FILES) +EXTRA_DIST = $(I_FILES) + include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3