summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
Diffstat (limited to 'c/src')
-rw-r--r--c/src/exec/itron/ChangeLog14
-rw-r--r--c/src/exec/itron/configure.ac7
-rw-r--r--c/src/exec/itron/include/Makefile.am50
-rw-r--r--c/src/exec/itron/include/itronsys/Makefile.am22
-rw-r--r--c/src/exec/itron/include/rtems/Makefile.am10
-rw-r--r--c/src/exec/itron/include/rtems/itron/Makefile.am25
-rw-r--r--c/src/exec/itron/inline/Makefile.am23
-rw-r--r--c/src/exec/itron/inline/rtems/Makefile.am10
-rw-r--r--c/src/exec/itron/inline/rtems/itron/Makefile.am29
-rw-r--r--c/src/exec/itron/macros/Makefile.am23
-rw-r--r--c/src/exec/itron/macros/rtems/Makefile.am10
-rw-r--r--c/src/exec/itron/macros/rtems/itron/Makefile.am29
12 files changed, 96 insertions, 156 deletions
diff --git a/c/src/exec/itron/ChangeLog b/c/src/exec/itron/ChangeLog
index 05f295261c..d61db1b7ff 100644
--- a/c/src/exec/itron/ChangeLog
+++ b/c/src/exec/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/c/src/exec/itron/configure.ac b/c/src/exec/itron/configure.ac
index 9d28b050b1..c3f0c3e337 100644
--- a/c/src/exec/itron/configure.ac
+++ b/c/src/exec/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/c/src/exec/itron/include/Makefile.am b/c/src/exec/itron/include/Makefile.am
index dd02c86c83..206ce956db 100644
--- a/c/src/exec/itron/include/Makefile.am
+++ b/c/src/exec/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/c/src/exec/itron/include/itronsys/Makefile.am b/c/src/exec/itron/include/itronsys/Makefile.am
deleted file mode 100644
index c26937d18e..0000000000
--- a/c/src/exec/itron/include/itronsys/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_itronsysdir = $(includedir)/itronsys
-
-include_itronsys_HEADERS = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h port.h \
- semaphore.h status.h sysmgmt.h task.h time.h types.h vmempool.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/itronsys \
- $(include_itronsys_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%)
-
-$(PROJECT_INCLUDE)/itronsys:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/itronsys/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/include/rtems/Makefile.am b/c/src/exec/itron/include/rtems/Makefile.am
deleted file mode 100644
index d6766c8306..0000000000
--- a/c/src/exec/itron/include/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = itron
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/include/rtems/itron/Makefile.am b/c/src/exec/itron/include/rtems/itron/Makefile.am
deleted file mode 100644
index d3bb7fc382..0000000000
--- a/c/src/exec/itron/include/rtems/itron/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_itrondir = $(includedir)/rtems/itron
-
-include_rtems_itron_HEADERS = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \
- msgbuffer.h network.h object.h port.h semaphore.h sysmgmt.h task.h \
- time.h vmempool.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
- $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
-
-$(PROJECT_INCLUDE)/rtems/itron:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/itron/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = README
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/inline/Makefile.am b/c/src/exec/itron/inline/Makefile.am
index 32269fcdcd..a9f5a25c1f 100644
--- a/c/src/exec/itron/inline/Makefile.am
+++ b/c/src/exec/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/c/src/exec/itron/inline/rtems/Makefile.am b/c/src/exec/itron/inline/rtems/Makefile.am
deleted file mode 100644
index d6766c8306..0000000000
--- a/c/src/exec/itron/inline/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = itron
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/inline/rtems/itron/Makefile.am b/c/src/exec/itron/inline/rtems/itron/Makefile.am
deleted file mode 100644
index 38b178c886..0000000000
--- a/c/src/exec/itron/inline/rtems/itron/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_itrondir = $(includedir)/rtems/itron
-
-I_FILES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \
- network.inl port.inl semaphore.inl sysmgmt.inl task.inl time.inl \
- vmempool.inl
-
-if INLINE
-include_rtems_itron_HEADERS = $(I_FILES)
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
- $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
-
-$(PROJECT_INCLUDE)/rtems/itron:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/itron/%.inl: %.inl
- $(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(I_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/macros/Makefile.am b/c/src/exec/itron/macros/Makefile.am
index 32269fcdcd..9ac3af11c1 100644
--- a/c/src/exec/itron/macros/Makefile.am
+++ b/c/src/exec/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
diff --git a/c/src/exec/itron/macros/rtems/Makefile.am b/c/src/exec/itron/macros/rtems/Makefile.am
deleted file mode 100644
index d6766c8306..0000000000
--- a/c/src/exec/itron/macros/rtems/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = itron
-
-include $(top_srcdir)/../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/macros/rtems/itron/Makefile.am b/c/src/exec/itron/macros/rtems/itron/Makefile.am
deleted file mode 100644
index 8a6c8a6450..0000000000
--- a/c/src/exec/itron/macros/rtems/itron/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_itrondir = $(includedir)/rtems/itron
-
-I_FILES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \
- network.inl port.inl semaphore.inl sysmgmt.inl task.inl time.inl \
- vmempool.inl
-
-if MACROS
-include_rtems_itron_HEADERS = $(I_FILES)
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/itron \
- $(include_rtems_itron_HEADERS:%=$(PROJECT_INCLUDE)/rtems/itron/%)
-
-$(PROJECT_INCLUDE)/rtems/itron:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/itron/%.inl: %.inl
- $(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(I_FILES)
-
-include $(top_srcdir)/../../../../automake/local.am
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 17:25:06 +0000