From 6d0a5c0bb9b6cff57ed26cfc50e2914ae6030ab0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 18 Jan 2002 15:10:34 +0000 Subject: 2002-01-18 Ralf Corsepius * Makefile.am: Include main.am, require automake-1.5. * pictures/Makefile.am: Require automake-1.5, fix +=. --- doc/started/ChangeLog | 6 ++++++ doc/started/Makefile.am | 3 ++- doc/started/pictures/Makefile.am | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/started/ChangeLog b/doc/started/ChangeLog index 80aefe0cce..14a292bba5 100644 --- a/doc/started/ChangeLog +++ b/doc/started/ChangeLog @@ -1,3 +1,9 @@ +2002-01-18 Ralf Corsepius + + * Makefile.am: Include main.am, require automake-1.5. + * pictures/Makefile.am: Require automake-1.5, fix +=. + + 2001-01-17 Joel Sherrill * .cvsignore: Added rtems_header.html and rtems_footer.html. diff --git a/doc/started/Makefile.am b/doc/started/Makefile.am index ba307bd9fe..bd618ca42e 100644 --- a/doc/started/Makefile.am +++ b/doc/started/Makefile.am @@ -6,7 +6,7 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 PROJECT = started EDITION = 1 @@ -14,6 +14,7 @@ EDITION = 1 SUBDIRS = pictures include $(top_srcdir)/project.am +include $(top_srcdir)/main.am GENERATED_FILES = binaries.texi buildc.texi buildrt.texi intro.texi \ nt.texi require.texi nextstep.texi sample.texi diff --git a/doc/started/pictures/Makefile.am b/doc/started/pictures/Makefile.am index 85c8bb807a..325922452f 100644 --- a/doc/started/pictures/Makefile.am +++ b/doc/started/pictures/Makefile.am @@ -1,16 +1,16 @@ ## $Id$ -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 PROJECT = started html_projectdir = $(htmldir)/$(PROJECT) if USE_HTML -html_project_DATA += sfile12c.jpg bit_c.jpg +html_project_DATA = sfile12c.jpg bit_c.jpg endif -noinst_DATA += bit_ada.jpg bit_ada.vsd bit_c.jpg bit_c.vsd scfile10.jpg \ +noinst_DATA = bit_ada.jpg bit_ada.vsd bit_c.jpg bit_c.vsd scfile10.jpg \ scfile10.vsd scfile11.jpg scfile11.vsd scfile12.jpg scfile12.vsd \ scfile13.jpg scfile13.vsd scsfile1.jpg scsfile1.vsd scsfile2.jpg \ scsfile2.vsd scsfile3.jpg scsfile3.vsd scsfile4.jpg scsfile4.vsd \ -- cgit v1.2.3