From bcdaffdf50895c349fd3fd6a702c2ac481ba7177 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Sep 2003 09:10:42 +0000 Subject: 2003-09-22 Ralf Corsepius * Makefile.am: Merger from rtems-4-6-branch. --- doc/FAQ/ChangeLog | 4 ++++ doc/FAQ/Makefile.am | 3 +-- doc/ada_user/ChangeLog | 4 ++++ doc/ada_user/Makefile.am | 4 ++-- doc/bsp_howto/ChangeLog | 4 ++++ doc/bsp_howto/Makefile.am | 3 +-- doc/develenv/ChangeLog | 4 ++++ doc/develenv/Makefile.am | 3 +-- doc/filesystem/ChangeLog | 4 ++++ doc/filesystem/Makefile.am | 3 +-- doc/itron3.0/ChangeLog | 4 ++++ doc/itron3.0/Makefile.am | 4 ++-- doc/networking/ChangeLog | 4 ++++ doc/networking/Makefile.am | 3 +-- doc/new_chapters/ChangeLog | 4 ++++ doc/new_chapters/Makefile.am | 3 +-- doc/porting/ChangeLog | 4 ++++ doc/porting/Makefile.am | 3 +-- doc/posix1003.1/ChangeLog | 4 ++++ doc/posix1003.1/Makefile.am | 3 +-- doc/posix_users/ChangeLog | 4 ++++ doc/posix_users/Makefile.am | 3 +-- doc/relnotes/ChangeLog | 4 ++++ doc/relnotes/Makefile.am | 3 +-- doc/rgdb_specs/ChangeLog | 4 ++++ doc/rgdb_specs/Makefile.am | 3 +-- doc/rtems_gdb/ChangeLog | 4 ++++ doc/rtems_gdb/Makefile.am | 3 +-- doc/started/ChangeLog | 4 ++++ doc/started/Makefile.am | 10 +++++++--- doc/started_ada/ChangeLog | 4 ++++ doc/started_ada/Makefile.am | 3 +-- doc/supplements/arm/ChangeLog | 4 ++++ doc/supplements/arm/Makefile.am | 3 +-- doc/supplements/c4x/ChangeLog | 4 ++++ doc/supplements/c4x/Makefile.am | 3 +-- doc/supplements/hppa1_1/ChangeLog | 4 ++++ doc/supplements/hppa1_1/Makefile.am | 3 +-- doc/supplements/i386/ChangeLog | 4 ++++ doc/supplements/i386/Makefile.am | 3 +-- 40 files changed, 108 insertions(+), 41 deletions(-) diff --git a/doc/FAQ/ChangeLog b/doc/FAQ/ChangeLog index 579143f286..58a093c0bd 100644 --- a/doc/FAQ/ChangeLog +++ b/doc/FAQ/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * FAQ.texi, basic.t, build45.t, entry, tools.t: Merge from branch. diff --git a/doc/FAQ/Makefile.am b/doc/FAQ/Makefile.am index a2473d5b9c..7ca13bad06 100644 --- a/doc/FAQ/Makefile.am +++ b/doc/FAQ/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = basic.texi tools.texi concepts.texi build45.texi bsp.texi \ debug.texi freesw.texi embeddedinfo.texi hwdebugaids.texi projects.texi \ endoftime.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = diff --git a/doc/ada_user/ChangeLog b/doc/ada_user/ChangeLog index 767c309737..83dc740c59 100644 --- a/doc/ada_user/ChangeLog +++ b/doc/ada_user/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-01-25 Ralf Corsepius * ada_user.texi: Set @setfilename ada_user.info. diff --git a/doc/ada_user/Makefile.am b/doc/ada_user/Makefile.am index 273afdb1b7..d98b1cf131 100644 --- a/doc/ada_user/Makefile.am +++ b/doc/ada_user/Makefile.am @@ -13,7 +13,7 @@ EDITION = 1 include $(top_srcdir)/project.am include $(top_srcdir)/main.am -COMMON_FILES = $(top_builddir)/user/bsp.texi $(top_builddir)/user/clock.texi \ +COMMON_FILES += $(top_builddir)/user/bsp.texi $(top_builddir)/user/clock.texi \ $(top_builddir)/user/concepts.texi $(top_builddir)/user/datatypes.texi \ $(top_builddir)/user/conf.texi $(top_builddir)/user/dirstat.texi \ $(top_builddir)/user/dpmem.texi $(top_builddir)/user/event.texi \ @@ -26,7 +26,7 @@ COMMON_FILES = $(top_builddir)/user/bsp.texi $(top_builddir)/user/clock.texi \ $(top_builddir)/user/schedule.texi $(top_builddir)/user/sem.texi \ $(top_builddir)/user/signal.texi $(top_builddir)/user/task.texi \ $(top_builddir)/user/timer.texi $(top_builddir)/user/userext.texi \ - $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi + $(top_srcdir)/common/cpright.texi FILES = example.texi diff --git a/doc/bsp_howto/ChangeLog b/doc/bsp_howto/ChangeLog index 3bba4cc238..631bb48784 100644 --- a/doc/bsp_howto/ChangeLog +++ b/doc/bsp_howto/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * analog.t, bsp_howto.texi, discrete.t, nvmem.t, target.t: Merge from diff --git a/doc/bsp_howto/Makefile.am b/doc/bsp_howto/Makefile.am index f26d93ffc5..b5b99ddf04 100644 --- a/doc/bsp_howto/Makefile.am +++ b/doc/bsp_howto/Makefile.am @@ -18,8 +18,7 @@ GENERATED_FILES = intro.texi target.texi makefiles.texi linkcmds.texi \ rtc.texi ata.texi ide-ctrl.texi nvmem.texi network.texi shmsupp.texi \ analog.texi discrete.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = diff --git a/doc/develenv/ChangeLog b/doc/develenv/ChangeLog index 6ccbeb39d3..253c6c9155 100644 --- a/doc/develenv/ChangeLog +++ b/doc/develenv/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * develenv.texi, direct.t, sample.t, utils.t: Merge from branch. diff --git a/doc/develenv/Makefile.am b/doc/develenv/Makefile.am index 1a97d72370..bc55043ec5 100644 --- a/doc/develenv/Makefile.am +++ b/doc/develenv/Makefile.am @@ -17,8 +17,7 @@ FILES = direct.texi intro.texi sample.texi utils.texi GENERATED_FILES = direct.texi sample.texi utils.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi info_TEXINFOS = develenv.texi develenv_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) diff --git a/doc/filesystem/ChangeLog b/doc/filesystem/ChangeLog index 802346752a..4d821b0b82 100644 --- a/doc/filesystem/ChangeLog +++ b/doc/filesystem/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * filesystem.texi: Merge from branch. diff --git a/doc/filesystem/Makefile.am b/doc/filesystem/Makefile.am index 14a02d10bf..6fd6fa10a2 100644 --- a/doc/filesystem/Makefile.am +++ b/doc/filesystem/Makefile.am @@ -17,8 +17,7 @@ BMENU2 += -c GENERATED_FILES = patheval.texi init.texi mounting.texi syscalls.texi \ fsrequirements.texi imfs.texi miniimfs.texi tftp.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = preface.texi diff --git a/doc/itron3.0/ChangeLog b/doc/itron3.0/ChangeLog index 3e172ba7dc..adc308e840 100644 --- a/doc/itron3.0/ChangeLog +++ b/doc/itron3.0/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * itron.texi: Merge from branch. diff --git a/doc/itron3.0/Makefile.am b/doc/itron3.0/Makefile.am index 46d7827860..25656727b6 100644 --- a/doc/itron3.0/Makefile.am +++ b/doc/itron3.0/Makefile.am @@ -13,13 +13,13 @@ EDITION = 1 include $(top_srcdir)/project.am include $(top_srcdir)/main.am -COMMON_FILES = $(top_srcdir)/common/setup.texi - GENERATED_FILES = status.texi task.texi tasksync.texi semaphore.texi \ eventflags.texi mailbox.texi msgbuffer.texi rendezvous.texi \ interrupt.texi memorypool.texi fixedblock.texi time.texi config.texi \ network.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi + FILES = preface.texi info_TEXINFOS = itron.texi diff --git a/doc/networking/ChangeLog b/doc/networking/ChangeLog index 11477a322d..7778f3894c 100644 --- a/doc/networking/ChangeLog +++ b/doc/networking/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * networking.texi: Merge from branch. diff --git a/doc/networking/Makefile.am b/doc/networking/Makefile.am index 38163707e1..84af3a7e23 100644 --- a/doc/networking/Makefile.am +++ b/doc/networking/Makefile.am @@ -18,8 +18,7 @@ BMENU2 += -c GENERATED_FILES = networkapp.texi driver.texi networktasks.texi testing.texi \ servers.texi decdriver.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = networktasks.texi preface.texi diff --git a/doc/new_chapters/ChangeLog b/doc/new_chapters/ChangeLog index 8b1cad5313..16c9cb6b86 100644 --- a/doc/new_chapters/ChangeLog +++ b/doc/new_chapters/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * new_chapters.texi: Merge from branch. diff --git a/doc/new_chapters/Makefile.am b/doc/new_chapters/Makefile.am index 1a9d39c06a..3f2daf69a6 100644 --- a/doc/new_chapters/Makefile.am +++ b/doc/new_chapters/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = adminiface.texi confspace.texi dumpcontrol.texi \ eventlog.texi stackchk.texi rtmonuse.texi cpuuse.texi error.texi \ monitor.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = 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 + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * 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) diff --git a/doc/posix1003.1/ChangeLog b/doc/posix1003.1/ChangeLog index 0580e9237b..c393a7aece 100644 --- a/doc/posix1003.1/ChangeLog +++ b/doc/posix1003.1/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * ch07.t, posix1003_1.texi, preface.texi: Merge from branch. diff --git a/doc/posix1003.1/Makefile.am b/doc/posix1003.1/Makefile.am index 9d5412f4e3..1a73d4edf4 100644 --- a/doc/posix1003.1/Makefile.am +++ b/doc/posix1003.1/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \ ch06.texi ch07.texi ch08.texi ch09.texi ch10.texi ch11.texi ch12.texi \ ch13.texi ch14.texi ch15.texi ch16.texi ch17.texi ch18.texi ch19.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = preface.texi diff --git a/doc/posix_users/ChangeLog b/doc/posix_users/ChangeLog index 9cace236f2..ef1dfd02c0 100644 --- a/doc/posix_users/ChangeLog +++ b/doc/posix_users/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * posix_users.texi: Merge from branch. diff --git a/doc/posix_users/Makefile.am b/doc/posix_users/Makefile.am index e4d6dd1185..0a7db36a78 100644 --- a/doc/posix_users/Makefile.am +++ b/doc/posix_users/Makefile.am @@ -19,8 +19,7 @@ GENERATED_FILES = cancel.texi clock.texi cond.texi cspecific.texi \ signal.texi status.texi systemdb.texi thread.texi timer.texi libc.texi \ libm.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = preface.texi info_TEXINFOS = posix_users.texi diff --git a/doc/relnotes/ChangeLog b/doc/relnotes/ChangeLog index acc2c436cc..81132f7e74 100644 --- a/doc/relnotes/ChangeLog +++ b/doc/relnotes/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * install.texi, intro.texi, relnotes.texi, status.texi: Merge from diff --git a/doc/relnotes/Makefile.am b/doc/relnotes/Makefile.am index ebf8df93b0..e86ee9af0a 100644 --- a/doc/relnotes/Makefile.am +++ b/doc/relnotes/Makefile.am @@ -13,8 +13,7 @@ EDITION = 1 include $(top_srcdir)/project.am include $(top_srcdir)/main.am -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = install.texi intro.texi probrep.texi relnotes.texi status.texi diff --git a/doc/rgdb_specs/ChangeLog b/doc/rgdb_specs/ChangeLog index a71a7062a6..ac25aa1275 100644 --- a/doc/rgdb_specs/ChangeLog +++ b/doc/rgdb_specs/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * rgdb_specs.texi: Merge from branch. diff --git a/doc/rgdb_specs/Makefile.am b/doc/rgdb_specs/Makefile.am index c4a5e9230d..bf9eb0eb38 100644 --- a/doc/rgdb_specs/Makefile.am +++ b/doc/rgdb_specs/Makefile.am @@ -15,8 +15,7 @@ include $(top_srcdir)/main.am GENERATED_FILES = intro.texi revision.texi objectives.texi gdbinternals.texi \ interfacing.texi comm.texi daemon.texi conclusion.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = diff --git a/doc/rtems_gdb/ChangeLog b/doc/rtems_gdb/ChangeLog index dd62ea8669..8836a13507 100644 --- a/doc/rtems_gdb/ChangeLog +++ b/doc/rtems_gdb/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * rtems_gdb.texi: Merge from branch. diff --git a/doc/rtems_gdb/Makefile.am b/doc/rtems_gdb/Makefile.am index eaeaa21728..b7924efe91 100644 --- a/doc/rtems_gdb/Makefile.am +++ b/doc/rtems_gdb/Makefile.am @@ -16,8 +16,7 @@ include $(top_srcdir)/main.am GENERATED_FILES = intro.texi swarch.texi started.texi commands.texi \ trouble.texi example.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = 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 + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * .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 + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * 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 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 + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * 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 diff --git a/doc/supplements/c4x/ChangeLog b/doc/supplements/c4x/ChangeLog index 7c4ba997a1..6aed113916 100644 --- a/doc/supplements/c4x/ChangeLog +++ b/doc/supplements/c4x/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * c4x.texi: Merge from branch. diff --git a/doc/supplements/c4x/Makefile.am b/doc/supplements/c4x/Makefile.am index 769340cffb..119498a57d 100644 --- a/doc/supplements/c4x/Makefile.am +++ b/doc/supplements/c4x/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timeBSP.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = preface.texi diff --git a/doc/supplements/hppa1_1/ChangeLog b/doc/supplements/hppa1_1/ChangeLog index 7ed3760f5c..1d11679bfd 100644 --- a/doc/supplements/hppa1_1/ChangeLog +++ b/doc/supplements/hppa1_1/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * hppa1_1.texi: Merge from branch. diff --git a/doc/supplements/hppa1_1/Makefile.am b/doc/supplements/hppa1_1/Makefile.am index e2f87d5de5..728a2edd02 100644 --- a/doc/supplements/hppa1_1/Makefile.am +++ b/doc/supplements/hppa1_1/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 \ timeSIMHPPA.texi -COMMON_FILES = $(top_srcdir)/common/setup.texi \ - $(top_srcdir)/common/cpright.texi +COMMON_FILES += $(top_srcdir)/common/cpright.texi FILES = preface.texi diff --git a/doc/supplements/i386/ChangeLog b/doc/supplements/i386/ChangeLog index 4ead789555..c8ef71fdb9 100644 --- a/doc/supplements/i386/ChangeLog +++ b/doc/supplements/i386/ChangeLog @@ -1,3 +1,7 @@ +2003-09-22 Ralf Corsepius + + * Makefile.am: Merger from rtems-4-6-branch. + 2003-09-19 Joel Sherrill * i386.texi: Merge from branch. diff --git a/doc/supplements/i386/Makefile.am b/doc/supplements/i386/Makefile.am index e9b0e77c14..7669b5ac4e 100644 --- a/doc/supplements/i386/Makefile.am +++ b/doc/supplements/i386/Makefile.am @@ -17,8 +17,7 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \ fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \ timeFORCE386.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 -- cgit v1.2.3