diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:54:43 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-22 09:54:43 +0000 |
commit | 49a0b5895ba2264bd0723930630ea5cb8e7298bb (patch) | |
tree | 3e1ac8fbb6c6fd4d4ed71fff895a05f4c4245a53 /doc/supplements/template | |
parent | 2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-49a0b5895ba2264bd0723930630ea5cb8e7298bb.tar.bz2 |
2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merger from rtems-4-6-branch.
Diffstat (limited to '')
-rw-r--r-- | doc/supplements/template/ChangeLog | 4 | ||||
-rw-r--r-- | doc/supplements/template/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/supplements/template/ChangeLog b/doc/supplements/template/ChangeLog index 60f2411d4f..a8bcecf020 100644 --- a/doc/supplements/template/ChangeLog +++ b/doc/supplements/template/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> * template.texi: Merge from branch. diff --git a/doc/supplements/template/Makefile.am b/doc/supplements/template/Makefile.am index d9b622890d..9a64d063f7 100644 --- a/doc/supplements/template/Makefile.am +++ b/doc/supplements/template/Makefile.am @@ -16,8 +16,7 @@ include $(top_srcdir)/supplements/supplement.am GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi wksheets.texi timing.texi \ timeBSP.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi FILES = preface.texi |