summaryrefslogtreecommitdiffstats
path: root/doc/FAQ
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/FAQ
parent2002-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (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/FAQ')
-rw-r--r--doc/FAQ/ChangeLog4
-rw-r--r--doc/FAQ/Makefile.am3
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/FAQ/ChangeLog b/doc/FAQ/ChangeLog
index 80aefe0cce..f0a659506a 100644
--- a/doc/FAQ/ChangeLog
+++ b/doc/FAQ/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/FAQ/Makefile.am b/doc/FAQ/Makefile.am
index b7b3f60c8e..2363c5b915 100644
--- a/doc/FAQ/Makefile.am
+++ b/doc/FAQ/Makefile.am
@@ -6,12 +6,13 @@
# $Id$
#
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
PROJECT = FAQ
EDITION = 1
include $(top_srcdir)/project.am
+include $(top_srcdir)/main.am
GENERATED_FILES = basic.texi tools.texi concepts.texi build45.texi bsp.texi \
debug.texi freesw.texi embeddedinfo.texi hwdebugaids.texi projects.texi \