2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>

* cpu_supplement/Makefile.am: Include main.am.

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.

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