summaryrefslogtreecommitdiffstats
path: root/doc/user
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-18 15:10:35 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-01-18 15:10:35 +0000
commit816539819aafa1b5325202cf5396764ad416a85d (patch)
treeb78e6bb04cc239a16308febceed9db5609860f1c /doc/user
parent6d0a5c0bb9b6cff57ed26cfc50e2914ae6030ab0 (diff)
downloadrtems-816539819aafa1b5325202cf5396764ad416a85d.tar.bz2
2002-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: include main.am, require automake-1.5.
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/ChangeLog4
-rw-r--r--doc/user/Makefile.am3
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/user/ChangeLog b/doc/user/ChangeLog
index d422895abc..29cc4690ab 100644
--- a/doc/user/ChangeLog
+++ b/doc/user/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: include main.am, require automake-1.5.
+
2001-01-17 Joel Sherrill <joel@OARcorp.com>
* .cvsignore: Added rtems_header.html and rtems_footer.html.
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index aef43a7de7..62e4ab19a2 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -6,12 +6,13 @@
# $Id$
#
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
PROJECT = c_user
EDITION = 1
include $(top_srcdir)/project.am
+include $(top_srcdir)/main.am
FILES = bsp.texi dirstat.texi example.texi glossary.texi preface.texi