From bcdaffdf50895c349fd3fd6a702c2ac481ba7177 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 09:10:42 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/itron3.0/ChangeLog | 4 ++++ doc/itron3.0/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'doc/itron3.0') 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 + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * 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 -- cgit v1.2.3