diff options
Diffstat (limited to 'doc/porting')
-rw-r--r-- | doc/porting/ChangeLog | 4 | ||||
-rw-r--r-- | doc/porting/Makefile.am | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/porting/ChangeLog b/doc/porting/ChangeLog index 16a17809af..02a610461e 100644 --- a/doc/porting/ChangeLog +++ b/doc/porting/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> * porting.texi: Merge from branch. diff --git a/doc/porting/Makefile.am b/doc/porting/Makefile.am index b01b151f1b..77c42bf03e 100644 --- a/doc/porting/Makefile.am +++ b/doc/porting/Makefile.am @@ -21,8 +21,7 @@ GENERATED_FILES = developtools.texi sourcecode.texi cpumodels.texi \ cpuinit.texi interrupts.texi taskcontext.texi idlethread.texi \ prioritybitmap.texi codetuning.texi miscellaneous.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi info_TEXINFOS = porting.texi porting_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) |