summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-06-11 10:55:13 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-06-11 10:55:13 +0000
commit4be24b32336482809328947d01eb285b8d91b842 (patch)
tree751fcff5a9c347018cff2be9a767273b029397bf /doc
parentRemove EDITION (Unused) (diff)
downloadrtems-4be24b32336482809328947d01eb285b8d91b842.tar.bz2
2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* cpu_supplement/Makefile.am: Include main.am.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog18
-rw-r--r--doc/cpu_supplement/Makefile.am9
2 files changed, 18 insertions, 9 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 527b8baa25..88617188ef 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,20 @@
-2010-05-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * cpu_supplement/Makefile.am: Include main.am.
+
+2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * ada_user/Makefile.am, bsp_howto/Makefile.am,
+ cpu_supplement/Makefile.am, develenv/Makefile.am,
+ filesystem/Makefile.am, itron3.0/Makefile.am,
+ networking/Makefile.am, new_chapters/Makefile.am,
+ porting/Makefile.am, posix1003.1/Makefile.am,
+ posix_users/Makefile.am, relnotes/Makefile.am,
+ shell/Makefile.am, started/Makefile.am,
+ started_ada/Makefile.am, user/Makefile.am:
+ Remove EDITION (Unused).
+
+2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* cpu_supplement/Makefile.am, cpu_supplement/cpu_supplement.texi:
Remove tic4x.
diff --git a/doc/cpu_supplement/Makefile.am b/doc/cpu_supplement/Makefile.am
index ae16f4c2c9..6799764bd9 100644
--- a/doc/cpu_supplement/Makefile.am
+++ b/doc/cpu_supplement/Makefile.am
@@ -9,17 +9,10 @@
PROJECT = cpu_supplement
include $(top_srcdir)/project.am
+include $(top_srcdir)/main.am
REPLACE2 = $(PERL) $(top_srcdir)/tools/word-replace2
-html_projectdir = $(htmldir)/$(PROJECT)
-
-TEXI2WWW_ARGS=\
--I $(srcdir) -I $(top_srcdir) -I $(top_builddir) \
--dirfile ../index.html \
--header rtems_header.html \
--footer rtems_footer.html \
--icons ../images
GENERATED_FILES = general.texi arm.texi avr.texi bfin.texi i386.texi lm32.texi \
m68k.texi mips.texi powerpc.texi sh.texi sparc.texi