From bcdaffdf50895c349fd3fd6a702c2ac481ba7177 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 09:10:42 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/started/ChangeLog | 4 ++++ doc/started/Makefile.am | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'doc/started') diff --git a/doc/started/ChangeLog b/doc/started/ChangeLog index cf826f6c72..a4778d5378 100644 --- a/doc/started/ChangeLog +++ b/doc/started/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * .cvsignore, binaries.t, buildc.t, buildrt.t, intro.t, nextstep.t, diff --git a/doc/started/Makefile.am b/doc/started/Makefile.am index 4cab9f117b..497172270b 100644 --- a/doc/started/Makefile.am +++ b/doc/started/Makefile.am @@ -16,10 +16,9 @@ include $(top_srcdir)/main.am GENERATED_FILES = binaries.texi buildc.texi buildrt.texi intro.texi \ nt.texi require.texi nextstep.texi sample.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi -FILES = tversions.texi +FILES = info_TEXINFOS = started.texi started_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) @@ -81,3 +80,8 @@ PICTURES = pictures/bit_ada.jpg pictures/bit_ada.vsd pictures/bit_c.jpg pictures pictures/sfile12c.jpg pictures/sfile12c.vsd EXTRA_DIST += $(PICTURES) + +tversions.texi: tversions.texi.in tversions.sed + sed -f tversions.sed $(srcdir)/tversions.texi.in > tversions.texi +CLEANFILES += tversions.texi +DISTCLEANFILES = tversions.sed -- cgit v1.2.3