From a11e5d35cd6f1e62efdef79ce2061b6bbfe4870e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Oct 2001 13:31:15 +0000 Subject: 2001-10-16 Ralf Corsepius * include/rtems/Makefile.am: Remove. * include/Makefile.am: Handle subdirs, require automake-1.5. * inline/rtems/Makefile.am: Remove. * inline/Makefile.am: Handle subdirs, require automake-1.5. * macros/rtems/Makefile.am: Remove. * Makefile.am: require automake-1.5. --- c/src/exec/sapi/ChangeLog | 9 +++++++++ c/src/exec/sapi/Makefile.am | 2 +- c/src/exec/sapi/include/Makefile.am | 29 +++++++++++++++++++++-------- c/src/exec/sapi/include/rtems/Makefile.am | 24 ------------------------ c/src/exec/sapi/inline/Makefile.am | 19 ++++++++++++++++--- c/src/exec/sapi/inline/rtems/Makefile.am | 22 ---------------------- c/src/exec/sapi/macros/Makefile.am | 19 ++++++++++++++++--- c/src/exec/sapi/macros/rtems/Makefile.am | 27 --------------------------- cpukit/sapi/ChangeLog | 9 +++++++++ cpukit/sapi/Makefile.am | 2 +- cpukit/sapi/include/Makefile.am | 29 +++++++++++++++++++++-------- cpukit/sapi/inline/Makefile.am | 19 ++++++++++++++++--- cpukit/sapi/macros/Makefile.am | 19 ++++++++++++++++--- 13 files changed, 126 insertions(+), 103 deletions(-) delete mode 100644 c/src/exec/sapi/include/rtems/Makefile.am delete mode 100644 c/src/exec/sapi/inline/rtems/Makefile.am delete mode 100644 c/src/exec/sapi/macros/rtems/Makefile.am diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog index c33c840937..46595a89b9 100644 --- a/c/src/exec/sapi/ChangeLog +++ b/c/src/exec/sapi/ChangeLog @@ -1,3 +1,12 @@ +2001-10-16 Ralf Corsepius + + * include/rtems/Makefile.am: Remove. + * include/Makefile.am: Handle subdirs, require automake-1.5. + * inline/rtems/Makefile.am: Remove. + * inline/Makefile.am: Handle subdirs, require automake-1.5. + * macros/rtems/Makefile.am: Remove. + * Makefile.am: require automake-1.5. + 2001-10-12 Joel Sherrill * include/rtems/directives.h: Fixed typo. diff --git a/c/src/exec/sapi/Makefile.am b/c/src/exec/sapi/Makefile.am index 242daede4e..59f18c7a79 100644 --- a/c/src/exec/sapi/Makefile.am +++ b/c/src/exec/sapi/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 SUBDIRS = include inline macros optman src diff --git a/c/src/exec/sapi/include/Makefile.am b/c/src/exec/sapi/include/Makefile.am index 7b3b7544f9..44b6440796 100644 --- a/c/src/exec/sapi/include/Makefile.am +++ b/c/src/exec/sapi/include/Makefile.am @@ -2,21 +2,34 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ include_HEADERS = confdefs.h PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +include_rtemsdir = $(includedir)/rtems -all-local: $(PREINSTALL_FILES) +include_rtems_HEADERS = rtems/config.h rtems/directives.h rtems/extension.h \ + rtems/fatal.h rtems/init.h rtems/io.h rtems/mptables.h rtems/sptables.h -SUBDIRS = rtems +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) + +EXTRA_DIST = rtems/README + +rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in + cd $(top_builddir) && CONFIG_FILES=sapi/include/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/include/rtems/Makefile.am b/c/src/exec/sapi/include/rtems/Makefile.am deleted file mode 100644 index 4bc6fcdc97..0000000000 --- a/c/src/exec/sapi/include/rtems/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtemsdir = $(includedir)/rtems - -include_rtems_HEADERS = config.h directives.h extension.h fatal.h init.h io.h mptables.h \ - sptables.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/%.h: %.h - $(INSTALL_DATA) $< $@ - -EXTRA_DIST = README - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/inline/Makefile.am b/c/src/exec/sapi/inline/Makefile.am index 0c97211587..55115aa33d 100644 --- a/c/src/exec/sapi/inline/Makefile.am +++ b/c/src/exec/sapi/inline/Makefile.am @@ -2,9 +2,22 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 -SUBDIRS = rtems +include_rtemsdir = $(includedir)/rtems + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +if INLINE +include_rtems_HEADERS = rtems/extension.inl + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_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/sapi/inline/rtems/Makefile.am b/c/src/exec/sapi/inline/rtems/Makefile.am deleted file mode 100644 index 36a30b5bc5..0000000000 --- a/c/src/exec/sapi/inline/rtems/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 -include_rtemsdir = $(includedir)/rtems - -if INLINE -include_rtems_HEADERS = extension.inl - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/%.inl: %.inl - $(INSTALL_DATA) $< $@ -endif - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/macros/Makefile.am b/c/src/exec/sapi/macros/Makefile.am index 0c97211587..3a2b5f0e23 100644 --- a/c/src/exec/sapi/macros/Makefile.am +++ b/c/src/exec/sapi/macros/Makefile.am @@ -2,9 +2,22 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 -SUBDIRS = rtems +include_rtemsdir = $(includedir)/rtems + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +if MACROS +include_rtems_HEADERS = rtems/extension.inl + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_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/sapi/macros/rtems/Makefile.am b/c/src/exec/sapi/macros/rtems/Makefile.am deleted file mode 100644 index 4ece1dfc6a..0000000000 --- a/c/src/exec/sapi/macros/rtems/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtemsdir = $(includedir)/rtems - -I_FILES = extension.inl - -if MACROS -include_rtems_HEADERS = $(I_FILES) - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/rtems/%.inl: %.inl - $(INSTALL_DATA) $< $@ -endif - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = $(I_FILES) - -include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog index c33c840937..46595a89b9 100644 --- a/cpukit/sapi/ChangeLog +++ b/cpukit/sapi/ChangeLog @@ -1,3 +1,12 @@ +2001-10-16 Ralf Corsepius + + * include/rtems/Makefile.am: Remove. + * include/Makefile.am: Handle subdirs, require automake-1.5. + * inline/rtems/Makefile.am: Remove. + * inline/Makefile.am: Handle subdirs, require automake-1.5. + * macros/rtems/Makefile.am: Remove. + * Makefile.am: require automake-1.5. + 2001-10-12 Joel Sherrill * include/rtems/directives.h: Fixed typo. diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index 242daede4e..59f18c7a79 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 SUBDIRS = include inline macros optman src diff --git a/cpukit/sapi/include/Makefile.am b/cpukit/sapi/include/Makefile.am index 7b3b7544f9..44b6440796 100644 --- a/cpukit/sapi/include/Makefile.am +++ b/cpukit/sapi/include/Makefile.am @@ -2,21 +2,34 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ include_HEADERS = confdefs.h PREINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +include_rtemsdir = $(includedir)/rtems -all-local: $(PREINSTALL_FILES) +include_rtems_HEADERS = rtems/config.h rtems/directives.h rtems/extension.h \ + rtems/fatal.h rtems/init.h rtems/io.h rtems/mptables.h rtems/sptables.h -SUBDIRS = rtems +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) + +EXTRA_DIST = rtems/README + +rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in + cd $(top_builddir) && CONFIG_FILES=sapi/include/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/sapi/inline/Makefile.am b/cpukit/sapi/inline/Makefile.am index 0c97211587..55115aa33d 100644 --- a/cpukit/sapi/inline/Makefile.am +++ b/cpukit/sapi/inline/Makefile.am @@ -2,9 +2,22 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 -SUBDIRS = rtems +include_rtemsdir = $(includedir)/rtems + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +if INLINE +include_rtems_HEADERS = rtems/extension.inl + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) +endif + +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am diff --git a/cpukit/sapi/macros/Makefile.am b/cpukit/sapi/macros/Makefile.am index 0c97211587..3a2b5f0e23 100644 --- a/cpukit/sapi/macros/Makefile.am +++ b/cpukit/sapi/macros/Makefile.am @@ -2,9 +2,22 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 -SUBDIRS = rtems +include_rtemsdir = $(includedir)/rtems + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +if MACROS +include_rtems_HEADERS = rtems/extension.inl + +PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) +endif + +all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3