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/sh | |
| 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 'doc/supplements/sh')
| -rw-r--r-- | doc/supplements/sh/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/supplements/sh/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/supplements/sh/ChangeLog b/doc/supplements/sh/ChangeLog index a8567d8d39..d9ef89c7be 100644 --- a/doc/supplements/sh/ChangeLog +++ b/doc/supplements/sh/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> * sh.texi: Merge from branch. diff --git a/doc/supplements/sh/Makefile.am b/doc/supplements/sh/Makefile.am index f0c588f597..1fe4533838 100644 --- a/doc/supplements/sh/Makefile.am +++ b/doc/supplements/sh/Makefile.am @@ -17,8 +17,7 @@ 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 |