summaryrefslogtreecommitdiffstats
path: root/doc/started_ada
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/started_ada
parent24dd0fb438a3529ce7bb47ef78ab3a91dd4ef004 (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/started_ada')
-rw-r--r--doc/started_ada/ChangeLog4
-rw-r--r--doc/started_ada/Makefile.am3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/started_ada/ChangeLog b/doc/started_ada/ChangeLog
index 10dc2d2b1b..fc09f6b894 100644
--- a/doc/started_ada/ChangeLog
+++ b/doc/started_ada/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>
* intro.t, started_ada.texi, tversions.texi: Merge from branch.
diff --git a/doc/started_ada/Makefile.am b/doc/started_ada/Makefile.am
index 8b0e3f87f7..69bd68c345 100644
--- a/doc/started_ada/Makefile.am
+++ b/doc/started_ada/Makefile.am
@@ -16,8 +16,7 @@ include $(top_srcdir)/main.am
GENERATED_FILES = buildada.texi buildrt.texi gdb.texi intro.texi \
require.texi sample.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
- $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
FILES = tversions.texi