summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:31:30 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:31:30 +0000
commitfc56625171c5c96b3763a6717a33805b5335b9a6 (patch)
tree3dc7fa01e569d7190a28d6d7f26270bb5facc5ca /cpukit
parenta11e5d35cd6f1e62efdef79ce2061b6bbfe4870e (diff)
downloadrtems-fc56625171c5c96b3763a6717a33805b5335b9a6.tar.bz2
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/Makefile.am: Remove. * include/rtems/rtems/Makefile.am: Remove. * include/Makefile.am: Handle subdirs, require automake-1.5. * inline/rtems/Makefile.am: Remove. * inline/rtems/rtems/Makefile.am: Remove. * inline/Makefile.am: Handle subdirs, require automake-1.5. * macros/rtems/Makefile.am: Remove. * macros/rtems/rtems/Makefile.am: Remove. * macros: Handle subdirs, require automake-1.5. * Makefile.am: require automake-1.5.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/rtems/ChangeLog13
-rw-r--r--cpukit/rtems/Makefile.am2
-rw-r--r--cpukit/rtems/include/Makefile.am40
-rw-r--r--cpukit/rtems/inline/Makefile.am24
-rw-r--r--cpukit/rtems/macros/Makefile.am24
5 files changed, 89 insertions, 14 deletions
diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog
index 57a07c1ecb..bc64acf5f5 100644
--- a/cpukit/rtems/ChangeLog
+++ b/cpukit/rtems/ChangeLog
@@ -1,3 +1,16 @@
+2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/rtems/Makefile.am: Remove.
+ * include/rtems/rtems/Makefile.am: Remove.
+ * include/Makefile.am: Handle subdirs, require automake-1.5.
+ * inline/rtems/Makefile.am: Remove.
+ * inline/rtems/rtems/Makefile.am: Remove.
+ * inline/Makefile.am: Handle subdirs, require automake-1.5.
+ * macros/rtems/Makefile.am: Remove.
+ * macros/rtems/rtems/Makefile.am: Remove.
+ * macros: Handle subdirs, require automake-1.5.
+ * Makefile.am: require automake-1.5.
+
2001-09-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/rtems/Makefile.am: Use 'PREINSTALL_FILES ='.
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index 242daede4e..59f18c7a79 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/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/rtems/include/Makefile.am b/cpukit/rtems/include/Makefile.am
index c5e9d17580..39d7bde82c 100644
--- a/cpukit/rtems/include/Makefile.am
+++ b/cpukit/rtems/include/Makefile.am
@@ -2,21 +2,47 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
+
+$(PROJECT_INCLUDE)/%.h: %.h
+ $(INSTALL_DATA) $< $@
include_HEADERS = rtems.h
+$(PROJECT_INCLUDE):
+ @$(mkinstalldirs) $@
+
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-$(PROJECT_INCLUDE):
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+
+$(PROJECT_INCLUDE)/rtems/rtems:
@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-all-local: $(PREINSTALL_FILES)
+## We only build multiprocessing related files if HAS_MP was defined
+MP_H_FILES = rtems/rtems/eventmp.h rtems/rtems/mp.h rtems/rtems/msgmp.h \
+ rtems/rtems/partmp.h rtems/rtems/regionmp.h rtems/rtems/semmp.h \
+ rtems/rtems/signalmp.h rtems/rtems/taskmp.h
+
+STD_H_FILES = rtems/rtems/asr.h rtems/rtems/attr.h rtems/rtems/cache.h \
+ rtems/rtems/clock.h rtems/rtems/config.h rtems/rtems/dpmem.h \
+ rtems/rtems/event.h rtems/rtems/eventset.h rtems/rtems/intr.h \
+ rtems/rtems/message.h rtems/rtems/modes.h rtems/rtems/options.h \
+ rtems/rtems/part.h rtems/rtems/ratemon.h rtems/rtems/region.h \
+ rtems/rtems/rtemsapi.h rtems/rtems/sem.h rtems/rtems/signal.h \
+ rtems/rtems/status.h rtems/rtems/support.h rtems/rtems/tasks.h \
+ rtems/rtems/timer.h rtems/rtems/types.h
-SUBDIRS = rtems
+if HAS_MP
+include_rtems_rtems_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
+else
+include_rtems_rtems_HEADERS = $(STD_H_FILES)
+endif
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
+ $(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/rtems/inline/Makefile.am b/cpukit/rtems/inline/Makefile.am
index 0c97211587..7365f30596 100644
--- a/cpukit/rtems/inline/Makefile.am
+++ b/cpukit/rtems/inline/Makefile.am
@@ -2,9 +2,27 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+
+$(PROJECT_INCLUDE)/rtems/rtems:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if INLINE
+include_rtems_rtems_HEADERS = rtems/rtems/asr.inl rtems/rtems/attr.inl \
+ rtems/rtems/dpmem.inl rtems/rtems/event.inl rtems/rtems/eventset.inl \
+ rtems/rtems/message.inl rtems/rtems/modes.inl rtems/rtems/options.inl \
+ rtems/rtems/part.inl rtems/rtems/ratemon.inl rtems/rtems/region.inl \
+ rtems/rtems/sem.inl rtems/rtems/status.inl rtems/rtems/support.inl \
+ rtems/rtems/tasks.inl rtems/rtems/timer.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/rtems \
+ $(include_rtems_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/rtems/macros/Makefile.am b/cpukit/rtems/macros/Makefile.am
index 0c97211587..7365f30596 100644
--- a/cpukit/rtems/macros/Makefile.am
+++ b/cpukit/rtems/macros/Makefile.am
@@ -2,9 +2,27 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_rtemsdir = $(includedir)/rtems/rtems
+
+$(PROJECT_INCLUDE)/rtems/rtems:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if INLINE
+include_rtems_rtems_HEADERS = rtems/rtems/asr.inl rtems/rtems/attr.inl \
+ rtems/rtems/dpmem.inl rtems/rtems/event.inl rtems/rtems/eventset.inl \
+ rtems/rtems/message.inl rtems/rtems/modes.inl rtems/rtems/options.inl \
+ rtems/rtems/part.inl rtems/rtems/ratemon.inl rtems/rtems/region.inl \
+ rtems/rtems/sem.inl rtems/rtems/status.inl rtems/rtems/support.inl \
+ rtems/rtems/tasks.inl rtems/rtems/timer.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/rtems \
+ $(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am