2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merger from rtems-4-6-branch.
2003-09-22 09:10:42 +00:00
parent 24dd0fb438
commit bcdaffdf50
40 changed files with 108 additions and 41 deletions
--- a/doc/FAQ/ChangeLog
+++ b/doc/FAQ/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>

 	* FAQ.texi, basic.t, build45.t, entry, tools.t: Merge from branch.
--- 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 =

--- a/doc/ada_user/ChangeLog
+++ b/doc/ada_user/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Merger from rtems-4-6-branch.
+
 2003-01-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

 	* ada_user.texi: Set @setfilename ada_user.info.
--- 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

--- a/doc/bsp_howto/ChangeLog
+++ b/doc/bsp_howto/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>

 	* analog.t, bsp_howto.texi, discrete.t, nvmem.t, target.t: Merge from
--- 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 =

--- a/doc/develenv/ChangeLog
+++ b/doc/develenv/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>

 	* develenv.texi, direct.t, sample.t, utils.t: Merge from branch.
--- 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)
--- a/doc/filesystem/ChangeLog
+++ b/doc/filesystem/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>

 	* filesystem.texi: Merge from branch.
--- 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

--- a/doc/itron3.0/ChangeLog
+++ b/doc/itron3.0/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>

 	* itron.texi: Merge from branch.
--- 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
--- a/doc/networking/ChangeLog
+++ b/doc/networking/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>

 	* networking.texi: Merge from branch.
--- 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

--- a/doc/new_chapters/ChangeLog
+++ b/doc/new_chapters/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>

 	* new_chapters.texi: Merge from branch.
--- 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 =

--- 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.
--- 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)
--- a/doc/posix1003.1/ChangeLog
+++ b/doc/posix1003.1/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>

 	* ch07.t, posix1003_1.texi, preface.texi: Merge from branch.
--- 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

--- a/doc/posix_users/ChangeLog
+++ b/doc/posix_users/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>

 	* posix_users.texi: Merge from branch.
--- 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
--- a/doc/relnotes/ChangeLog
+++ b/doc/relnotes/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>

 	* install.texi, intro.texi, relnotes.texi, status.texi: Merge from
--- 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

--- a/doc/rgdb_specs/ChangeLog
+++ b/doc/rgdb_specs/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>

 	* rgdb_specs.texi: Merge from branch.
--- 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 =

--- a/doc/rtems_gdb/ChangeLog
+++ b/doc/rtems_gdb/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>

 	* rtems_gdb.texi: Merge from branch.
--- 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 =

--- a/doc/started/ChangeLog
+++ b/doc/started/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>

 	* .cvsignore, binaries.t, buildc.t, buildrt.t, intro.t, nextstep.t,
--- 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
--- a/doc/started_ada/ChangeLog
+++ b/doc/started_ada/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>

 	* intro.t, started_ada.texi, tversions.texi: Merge from branch.
--- 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

--- 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.
--- 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

--- a/doc/supplements/c4x/ChangeLog
+++ b/doc/supplements/c4x/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>

 	* c4x.texi: Merge from branch.
--- 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

--- a/doc/supplements/hppa1_1/ChangeLog
+++ b/doc/supplements/hppa1_1/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>

 	* hppa1_1.texi: Merge from branch.
--- 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

--- a/doc/supplements/i386/ChangeLog
+++ b/doc/supplements/i386/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>

 	* i386.texi: Merge from branch.
--- 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