diff options
Diffstat (limited to 'doc/supplements/arm')
| -rw-r--r-- | doc/supplements/arm/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/supplements/arm/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/supplements/arm/ChangeLog b/doc/supplements/arm/ChangeLog index 83f8e83398..e38cfd9991 100644 --- a/doc/supplements/arm/ChangeLog +++ b/doc/supplements/arm/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> * arm.texi: Merge from branch. diff --git a/doc/supplements/arm/Makefile.am b/doc/supplements/arm/Makefile.am index c90a569d72..8b3141ae1e 100644 --- a/doc/supplements/arm/Makefile.am +++ b/doc/supplements/arm/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 |