summaryrefslogtreecommitdiffstats
path: root/doc/itron3.0
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:10:42 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:10:42 +0000
commitbcdaffdf50895c349fd3fd6a702c2ac481ba7177 (patch)
tree233c6eda15548c65dfa574f3faecb064ba7bfc00 /doc/itron3.0
parent2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-bcdaffdf50895c349fd3fd6a702c2ac481ba7177.tar.bz2
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to 'doc/itron3.0')
-rw-r--r--doc/itron3.0/ChangeLog4
-rw-r--r--doc/itron3.0/Makefile.am4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/itron3.0/ChangeLog b/doc/itron3.0/ChangeLog
index 3e172ba7dc..adc308e840 100644
--- a/doc/itron3.0/ChangeLog
+++ b/doc/itron3.0/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Merger from rtems-4-6-branch.
+
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* itron.texi: Merge from branch.
diff --git a/doc/itron3.0/Makefile.am b/doc/itron3.0/Makefile.am
index 46d7827860..25656727b6 100644
--- a/doc/itron3.0/Makefile.am
+++ b/doc/itron3.0/Makefile.am
@@ -13,13 +13,13 @@ EDITION = 1
include $(top_srcdir)/project.am
include $(top_srcdir)/main.am
-COMMON_FILES = $(top_srcdir)/common/setup.texi
-
GENERATED_FILES = status.texi task.texi tasksync.texi semaphore.texi \
eventflags.texi mailbox.texi msgbuffer.texi rendezvous.texi \
interrupt.texi memorypool.texi fixedblock.texi time.texi config.texi \
network.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
+
FILES = preface.texi
info_TEXINFOS = itron.texi