diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-16 13:31:15 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-16 13:31:15 +0000 |
commit | a11e5d35cd6f1e62efdef79ce2061b6bbfe4870e (patch) | |
tree | b64dd8865d46828e8d531e404ca6c97d5841de9f /c/src/exec/sapi/macros | |
parent | 2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-a11e5d35cd6f1e62efdef79ce2061b6bbfe4870e.tar.bz2 |
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
Diffstat (limited to 'c/src/exec/sapi/macros')
-rw-r--r-- | c/src/exec/sapi/macros/Makefile.am | 19 | ||||
-rw-r--r-- | c/src/exec/sapi/macros/rtems/Makefile.am | 27 |
2 files changed, 16 insertions, 30 deletions
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 |