summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:31:15 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:31:15 +0000
commita11e5d35cd6f1e62efdef79ce2061b6bbfe4870e (patch)
treeb64dd8865d46828e8d531e404ca6c97d5841de9f /cpukit
parentff61414ac86ec7097a1c39a6904dacddf6f90599 (diff)
downloadrtems-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 'cpukit')
-rw-r--r--cpukit/sapi/ChangeLog9
-rw-r--r--cpukit/sapi/Makefile.am2
-rw-r--r--cpukit/sapi/include/Makefile.am29
-rw-r--r--cpukit/sapi/inline/Makefile.am19
-rw-r--r--cpukit/sapi/macros/Makefile.am19
5 files changed, 63 insertions, 15 deletions
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 <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.
+
2001-10-12 Joel Sherrill <joel@OARcorp.com>
* 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