From 49a0b5895ba2264bd0723930630ea5cb8e7298bb Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 09:54:43 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/supplements/powerpc/ChangeLog | 4 ++++ doc/supplements/powerpc/Makefile.am | 3 +-- doc/supplements/sh/ChangeLog | 4 ++++ doc/supplements/sh/Makefile.am | 3 +-- doc/supplements/template/ChangeLog | 4 ++++ doc/supplements/template/Makefile.am | 3 +-- 6 files changed, 15 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/supplements/powerpc/ChangeLog b/doc/supplements/powerpc/ChangeLog index c8be5d89a4..b14568e8bd 100644 --- a/doc/supplements/powerpc/ChangeLog +++ b/doc/supplements/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * powerpc.texi: Merge from branch. diff --git a/doc/supplements/powerpc/Makefile.am b/doc/supplements/powerpc/Makefile.am index 9184893c93..edbf8560e1 100644 --- a/doc/supplements/powerpc/Makefile.am +++ b/doc/supplements/powerpc/Makefile.am @@ -16,8 +16,7 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timePSIM.texi timeDMV177.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi FILES = preface.texi diff --git a/doc/supplements/sh/ChangeLog b/doc/supplements/sh/ChangeLog index a8567d8d39..d9ef89c7be 100644 --- a/doc/supplements/sh/ChangeLog +++ b/doc/supplements/sh/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * sh.texi: Merge from branch. diff --git a/doc/supplements/sh/Makefile.am b/doc/supplements/sh/Makefile.am index f0c588f597..1fe4533838 100644 --- a/doc/supplements/sh/Makefile.am +++ b/doc/supplements/sh/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeBSP.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi FILES = preface.texi diff --git a/doc/supplements/template/ChangeLog b/doc/supplements/template/ChangeLog index 60f2411d4f..a8bcecf020 100644 --- a/doc/supplements/template/ChangeLog +++ b/doc/supplements/template/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * template.texi: Merge from branch. diff --git a/doc/supplements/template/Makefile.am b/doc/supplements/template/Makefile.am index d9b622890d..9a64d063f7 100644 --- a/doc/supplements/template/Makefile.am +++ b/doc/supplements/template/Makefile.am @@ -16,8 +16,7 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeBSP.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi FILES = preface.texi -- cgit v1.2.3