summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:36:28 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-09-22 09:36:28 +0000
commit898505736e85780855634220c8cc25e9dd11d418 (patch)
tree6cbf99604fc39ba1fae42ff33f1a3eefee989664 /doc
parentbcdaffdf50895c349fd3fd6a702c2ac481ba7177 (diff)
downloadrtems-898505736e85780855634220c8cc25e9dd11d418.tar.bz2
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to 'doc')
-rw-r--r--doc/supplements/i960/ChangeLog4
-rw-r--r--doc/supplements/i960/Makefile.am3
-rw-r--r--doc/supplements/m68k/ChangeLog4
-rw-r--r--doc/supplements/m68k/Makefile.am3
-rw-r--r--doc/supplements/mips/ChangeLog4
-rw-r--r--doc/supplements/mips/Makefile.am3
-rw-r--r--doc/supplements/mips64orion/ChangeLog4
-rw-r--r--doc/supplements/mips64orion/Makefile.am3
-rw-r--r--doc/supplements/sparc/ChangeLog4
-rw-r--r--doc/supplements/sparc/Makefile.am3
10 files changed, 25 insertions, 10 deletions
diff --git a/doc/supplements/i960/ChangeLog b/doc/supplements/i960/ChangeLog
index e3d66d046f..8d680f8a5b 100644
--- a/doc/supplements/i960/ChangeLog
+++ b/doc/supplements/i960/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>
* i960.texi: Merge from branch.
diff --git a/doc/supplements/i960/Makefile.am b/doc/supplements/i960/Makefile.am
index fc6859166e..778ac4609e 100644
--- a/doc/supplements/i960/Makefile.am
+++ b/doc/supplements/i960/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 \
timeCVME961.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/m68k/ChangeLog b/doc/supplements/m68k/ChangeLog
index 9e68258f21..6d48bf0be6 100644
--- a/doc/supplements/m68k/ChangeLog
+++ b/doc/supplements/m68k/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>
* m68k.texi: Merge from branch.
diff --git a/doc/supplements/m68k/Makefile.am b/doc/supplements/m68k/Makefile.am
index e4ac248b34..60271d46ad 100644
--- a/doc/supplements/m68k/Makefile.am
+++ b/doc/supplements/m68k/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 \
timeMVME136.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/mips/ChangeLog b/doc/supplements/mips/ChangeLog
index 5a05131ffd..0fbe17b76f 100644
--- a/doc/supplements/mips/ChangeLog
+++ b/doc/supplements/mips/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>
* mips.texi: Merge from branch.
diff --git a/doc/supplements/mips/Makefile.am b/doc/supplements/mips/Makefile.am
index a30d214d8a..93cc8916ea 100644
--- a/doc/supplements/mips/Makefile.am
+++ b/doc/supplements/mips/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/mips64orion/ChangeLog b/doc/supplements/mips64orion/ChangeLog
index 4fc0c028ea..cfddcda401 100644
--- a/doc/supplements/mips64orion/ChangeLog
+++ b/doc/supplements/mips64orion/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>
* mips64orion.texi: Merge from branch.
diff --git a/doc/supplements/mips64orion/Makefile.am b/doc/supplements/mips64orion/Makefile.am
index 96394f8f66..9feb94934b 100644
--- a/doc/supplements/mips64orion/Makefile.am
+++ b/doc/supplements/mips64orion/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/sparc/ChangeLog b/doc/supplements/sparc/ChangeLog
index e4551499fa..02d51feed4 100644
--- a/doc/supplements/sparc/ChangeLog
+++ b/doc/supplements/sparc/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>
* sparc.texi: Merge from branch.
diff --git a/doc/supplements/sparc/Makefile.am b/doc/supplements/sparc/Makefile.am
index 374610472a..de623e4a1f 100644
--- a/doc/supplements/sparc/Makefile.am
+++ b/doc/supplements/sparc/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 \
timeERC32.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
- $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
FILES = preface.texi