summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:29:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-16 13:29:41 +0000
commit5a6ad2a2e91adfd4e38f8865418ce7a5ada76ca3 (patch)
treeeb4b7dc58dcf8fb5624c97eaa8ce4885522b537f /cpukit
parent7b2368b03d3a16adb60987dfe05b8fe509049671 (diff)
downloadrtems-5a6ad2a2e91adfd4e38f8865418ce7a5ada76ca3.tar.bz2
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/itronsys/Makefile.am: Remove. * include/rtems/Makefile.am: Remove. * include/rtems/itron/Makefile.am: Remove. * inline/rtems/Makefile.am: Remove. * inline/rtems/itron/Makefile.am: Remove. * macros/rtems/Makefile.am: Remove. * macros/rtems/itron/Makefile.am: Remove. * include/Makefile.am: handle subdirs. * inline/Makefile.am: handle subdirs. * macros/Makefile.am: handle subdirs. * configure.ac: Reflect changes above.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/itron/ChangeLog14
-rw-r--r--cpukit/itron/configure.ac7
-rw-r--r--cpukit/itron/include/Makefile.am50
-rw-r--r--cpukit/itron/inline/Makefile.am23
-rw-r--r--cpukit/itron/macros/Makefile.am23
5 files changed, 96 insertions, 21 deletions
diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog
index 05f295261c..d61db1b7ff 100644
--- a/cpukit/itron/ChangeLog
+++ b/cpukit/itron/ChangeLog
@@ -1,3 +1,17 @@
+2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/itronsys/Makefile.am: Remove.
+ * include/rtems/Makefile.am: Remove.
+ * include/rtems/itron/Makefile.am: Remove.
+ * inline/rtems/Makefile.am: Remove.
+ * inline/rtems/itron/Makefile.am: Remove.
+ * macros/rtems/Makefile.am: Remove.
+ * macros/rtems/itron/Makefile.am: Remove.
+ * include/Makefile.am: handle subdirs.
+ * inline/Makefile.am: handle subdirs.
+ * macros/Makefile.am: handle subdirs.
+ * configure.ac: Reflect changes above.
+
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.
diff --git a/cpukit/itron/configure.ac b/cpukit/itron/configure.ac
index 9d28b050b1..c3f0c3e337 100644
--- a/cpukit/itron/configure.ac
+++ b/cpukit/itron/configure.ac
@@ -49,15 +49,8 @@ AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_FILES([Makefile
src/Makefile
include/Makefile
-include/itronsys/Makefile
-include/rtems/Makefile
-include/rtems/itron/Makefile
inline/Makefile
-inline/rtems/Makefile
-inline/rtems/itron/Makefile
macros/Makefile
-macros/rtems/Makefile
-macros/rtems/itron/Makefile
])
AC_OUTPUT
diff --git a/cpukit/itron/include/Makefile.am b/cpukit/itron/include/Makefile.am
index dd02c86c83..206ce956db 100644
--- a/cpukit/itron/include/Makefile.am
+++ b/cpukit/itron/include/Makefile.am
@@ -2,21 +2,55 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
+
+$(PROJECT_INCLUDE):
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/itronsys:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems/itron:
+ @$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+## include
include_HEADERS = itron.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-$(PROJECT_INCLUDE):
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
+## itronsys
-all-local: $(PREINSTALL_FILES)
+include_itronsysdir = $(includedir)/itronsys
+
+include_itronsys_HEADERS = itronsys/eventflags.h itronsys/fmempool.h \
+ itronsys/intr.h itronsys/mbox.h itronsys/msgbuffer.h itronsys/network.h \
+ itronsys/port.h itronsys/semaphore.h itronsys/status.h itronsys/sysmgmt.h \
+ itronsys/task.h itronsys/time.h itronsys/types.h itronsys/vmempool.h
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \
+ $(include_itronsys_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+EXTRA_DIST = itronsys/README
-SUBDIRS = rtems itronsys
+## rtems/itron
+include_rtems_itrondir = $(includedir)/rtems/itron
+
+include_rtems_itron_HEADERS = rtems/itron/config.h rtems/itron/eventflags.h \
+ rtems/itron/fmempool.h rtems/itron/intr.h rtems/itron/itronapi.h \
+ rtems/itron/mbox.h rtems/itron/msgbuffer.h rtems/itron/network.h \
+ rtems/itron/object.h rtems/itron/port.h rtems/itron/semaphore.h \
+ rtems/itron/sysmgmt.h rtems/itron/task.h rtems/itron/time.h \
+ rtems/itron/vmempool.h
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/itron \
+ $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+EXTRA_DIST += rtems/itron/README
+
+## General
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/itron/inline/Makefile.am b/cpukit/itron/inline/Makefile.am
index 32269fcdcd..a9f5a25c1f 100644
--- a/cpukit/itron/inline/Makefile.am
+++ b/cpukit/itron/inline/Makefile.am
@@ -2,9 +2,26 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_itrondir = $(includedir)/rtems/itron
+
+$(PROJECT_INCLUDE)/rtems/itron:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if INLINE
+include_rtems_itron_HEADERS = rtems/itron/eventflags.inl \
+ rtems/itron/fmempool.inl rtems/itron/intr.inl rtems/itron/mbox.inl \
+ rtems/itron/msgbuffer.inl rtems/itron/network.inl rtems/itron/port.inl \
+ rtems/itron/semaphore.inl rtems/itron/sysmgmt.inl rtems/itron/task.inl \
+ rtems/itron/time.inl rtems/itron/vmempool.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
+ $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/itron/macros/Makefile.am b/cpukit/itron/macros/Makefile.am
index 32269fcdcd..9ac3af11c1 100644
--- a/cpukit/itron/macros/Makefile.am
+++ b/cpukit/itron/macros/Makefile.am
@@ -2,9 +2,26 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
-SUBDIRS = rtems
+include_rtems_itrondir = $(includedir)/rtems/itron
+
+$(PROJECT_INCLUDE)/rtems/itron:
+ @$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%: %
+ $(INSTALL_DATA) $< $@
+
+if MACROS
+include_rtems_itron_HEADERS = rtems/itron/eventflags.inl \
+ rtems/itron/fmempool.inl rtems/itron/intr.inl rtems/itron/mbox.inl \
+ rtems/itron/msgbuffer.inl rtems/itron/network.inl rtems/itron/port.inl \
+ rtems/itron/semaphore.inl rtems/itron/sysmgmt.inl rtems/itron/task.inl \
+ rtems/itron/time.inl rtems/itron/vmempool.inl
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
+ $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/%)
+endif
+
+all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am