2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Merger from rtems-4-6-branch.

8 files changed, 20 insertions, 8 deletions

diff --git a/doc/supplements/arm/ChangeLog b/doc/supplements/arm/ChangeLog
index 83f8e83398..e38cfd9991 100644
--- a/doc/supplements/arm/ChangeLog
+++ b/doc/supplements/arm/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>
 
 	* arm.texi: Merge from branch.
diff --git a/doc/supplements/arm/Makefile.am b/doc/supplements/arm/Makefile.am
index c90a569d72..8b3141ae1e 100644
--- a/doc/supplements/arm/Makefile.am
+++ b/doc/supplements/arm/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
 
diff --git a/doc/supplements/c4x/ChangeLog b/doc/supplements/c4x/ChangeLog
index 7c4ba997a1..6aed113916 100644
--- a/doc/supplements/c4x/ChangeLog
+++ b/doc/supplements/c4x/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>
 
 	* c4x.texi: Merge from branch.
diff --git a/doc/supplements/c4x/Makefile.am b/doc/supplements/c4x/Makefile.am
index 769340cffb..119498a57d 100644
--- a/doc/supplements/c4x/Makefile.am
+++ b/doc/supplements/c4x/Makefile.am
@@ -17,8 +17,7 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
     fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
     timeBSP.texi
 
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
-    $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
 
 FILES = preface.texi
 
diff --git a/doc/supplements/hppa1_1/ChangeLog b/doc/supplements/hppa1_1/ChangeLog
index 7ed3760f5c..1d11679bfd 100644
--- a/doc/supplements/hppa1_1/ChangeLog
+++ b/doc/supplements/hppa1_1/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>
 
 	* hppa1_1.texi: Merge from branch.
diff --git a/doc/supplements/hppa1_1/Makefile.am b/doc/supplements/hppa1_1/Makefile.am
index e2f87d5de5..728a2edd02 100644
--- a/doc/supplements/hppa1_1/Makefile.am
+++ b/doc/supplements/hppa1_1/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 \
     timeSIMHPPA.texi
 
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
-    $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
 
 FILES = preface.texi
 
diff --git a/doc/supplements/i386/ChangeLog b/doc/supplements/i386/ChangeLog
index 4ead789555..c8ef71fdb9 100644
--- a/doc/supplements/i386/ChangeLog
+++ b/doc/supplements/i386/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>
 
 	* i386.texi: Merge from branch.
diff --git a/doc/supplements/i386/Makefile.am b/doc/supplements/i386/Makefile.am
index e9b0e77c14..7669b5ac4e 100644
--- a/doc/supplements/i386/Makefile.am
+++ b/doc/supplements/i386/Makefile.am
@@ -17,8 +17,7 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
     fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
     timeFORCE386.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