diff options
Diffstat (limited to '')
-rw-r--r-- | doc/started/ChangeLog | 4 | ||||
-rw-r--r-- | doc/started/Makefile.am | 10 | ||||
-rw-r--r-- | doc/started_ada/ChangeLog | 4 | ||||
-rw-r--r-- | doc/started_ada/Makefile.am | 3 |
4 files changed, 16 insertions, 5 deletions
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 <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill <joel@OARcorp.com> * .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 diff --git a/doc/started_ada/ChangeLog b/doc/started_ada/ChangeLog index 10dc2d2b1b..fc09f6b894 100644 --- a/doc/started_ada/ChangeLog +++ b/doc/started_ada/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill <joel@OARcorp.com> * intro.t, started_ada.texi, tversions.texi: Merge from branch. diff --git a/doc/started_ada/Makefile.am b/doc/started_ada/Makefile.am index 8b0e3f87f7..69bd68c345 100644 --- a/doc/started_ada/Makefile.am +++ b/doc/started_ada/Makefile.am @@ -16,8 +16,7 @@ include $(top_srcdir)/main.am GENERATED_FILES = buildada.texi buildrt.texi gdb.texi intro.texi \ require.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 |