Patch rtems-rc-4.5.0-21.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

which splits the current monolithic specs files into a sequence of subparts. These can be concatenated togather to make a the whole .spec file. This cleans up the maintenance problem of having "all languages" and a "C/C++ only" gccnewlib spec files. Plus it should make it easier to produce variants like the gdb-m68k-bdm which require special hackery. :) Ralf's comments: It addresses the way *.spec.in get composed inside of the source tree. Changes: * Each spec.in is broken into several files (*.add), one *.add file per sub-package. * Each Makefile.am composes spec.ins from the *.add files * Removal of redundant automake support files. * Default value for BuildRoot changed to /tmp/<spec-file-name> * %clean stage added to *specs Advantages (IMHO). * The *.add files are easier to adminstrate and more flexible in comparison to the former *.specs.ins. * gccnewlib_c_only.spec.in now is composed from the same sources as gccnewlib.spec.in (less errors) * If using the default BuildRoot --clean now deletes all files that were generated while building. Notes: * rtems.spec.in has not yet been adapted to the scheme used for the other *spec.ins * Except for cosmetical changes the internals of the *.spec files should not have changed. To Apply: cvs rm -f scripts/binutils/binutils.spec.in cvs rm -f scripts/gccnewlib/gccnewlib.spec.in cvs rm -f scripts/gccnewlib/gccnewlib_c_only.spec.in cvs rm -f scripts/gdb/gdb.spec.in cvs rm -f scripts/config.sub cvs rm -f scripts/config.guess cvs rm -f scripts/install-sh cvs rm -f scripts/mkinstalldirs cvs rm -f scripts/missing patch -p1 < rtems-rc-4.5.0-21.diff cvs add scripts/*/*.add cvs add scripts/*/README
2000-06-10 19:41:09 +00:00
parent 6810959cf3
commit 110445cba5
82 changed files with 304 additions and 293 deletions
--- a/doc/FAQ/FAQ.texi
+++ b/doc/FAQ/FAQ.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/FAQ/Makefile.am
+++ b/doc/FAQ/Makefile.am
@@ -17,7 +17,8 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES =

@@ -83,4 +84,5 @@ $(srcdir)/endoftime.texi: endoftime.t
 	    -u "Top" \
 	    -n "" < $< > $@

-EXTRA_DIST = entry *.t
+EXTRA_DIST = entry basic.t bsp.t build45.t concepts.t debug.t embeddedinfo.t \
+    endoftime.t freesw.t hwdebugaids.t projects.t tools.t
--- a/doc/FAQ/basic.t
+++ b/doc/FAQ/basic.t
@@ -176,8 +176,6 @@ No.

@section RTEMS Mailing List

-Yes.  
-
@example
 rtems-users@@OARcorp.com
@end example
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,41 +6,20 @@ AUTOMAKE_OPTIONS = foreign 1.4

 # NOTE: The order of the directories is essential.
 #       + tools, common and images are shared across many documents
-SUBDIRS = \
-tools \
-common \
-images \
-FAQ \
-started \
-user \
-bsp_howto \
-porting \
-develenv \
-posix_users \
-posix1003.1 \
-filesystem \
-itron3.0 \
-networking \
-ada_user \
-started_ada \
-rtems_gdb \
-rgdb_specs \
-new_chapters \
-relnotes \
-supplements \
-gnu_docs \
-src2html
+
+SUBDIRS = tools common images FAQ started user bsp_howto porting develenv \
+    posix_users posix1003.1 filesystem itron3.0 networking ada_user \
+    started_ada rtems_gdb rgdb_specs new_chapters relnotes supplements \
+    gnu_docs src2html

 if USE_HTML
-html_DATA = index.html HELP.html BAD.html
+html_DATA = index.html HELP.html
 endif

 AUTOMAKE_FILES = project.am

 noinst_SCRIPTS = bootstrap

-EXTRA_DIST = \
-$(AUTOMAKE_FILES) \
-HELP.html BAD.html \
-texinfo/texinfo.tex \
-$(noinst_SCRIPTS)
+EXTRA_DIST = $(AUTOMAKE_FILES) HELP.html texinfo/texinfo.tex \
+    $(noinst_SCRIPTS) rtems_header.html.in rtems_footer.html.in
+
--- a/doc/ada_user/Makefile.am
+++ b/doc/ada_user/Makefile.am
@@ -34,7 +34,7 @@ rtemspie.eps: $(top_srcdir)/user/rtemspie.eps
 	$(LN_S) $<
 states.eps: $(top_srcdir)/user/states.eps
 	$(LN_S) $<
-CLEANFILES += rtemspie.eps states.eps
+CLEANFILES += rtemspie.eps states.eps rtemsarc.png rtemspie.png states.png

 rtemsarc.png: $(top_srcdir)/user/rtemsarc.png
 	$(LN_S) $<
@@ -42,7 +42,6 @@ rtemspie.png: $(top_srcdir)/user/rtemspie.png
 	$(LN_S) $<
 states.png: $(top_srcdir)/user/states.png
 	$(LN_S) $<
-CLEANFILES += rtemsarc.png rtemspie.png states.png

 info_TEXINFOS = ada_user.texi
 ada_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
--- a/doc/ada_user/ada_user.texi
+++ b/doc/ada_user/ada_user.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -70,39 +70,39 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
@c  The alternative is to rework a sentence to avoid this problem.

-@include ../user/preface.texi
-@include ../user/overview.texi
-@include ../user/concepts.texi
-@include ../user/datatypes.texi
-@include ../user/init.texi
-@include ../user/task.texi
-@include ../user/intr.texi
-@include ../user/clock.texi
-@include ../user/timer.texi
-@include ../user/sem.texi
-@include ../user/msg.texi
-@include ../user/event.texi
-@include ../user/signal.texi
-@include ../user/part.texi
-@include ../user/region.texi
-@include ../user/dpmem.texi
-@include ../user/io.texi
-@include ../user/fatal.texi
-@include ../user/schedule.texi
-@include ../user/rtmon.texi
-@include ../user/bsp.texi
-@include ../user/userext.texi
-@include ../user/conf.texi
-@include ../user/mp.texi
-@include ../user/dirstat.texi
+@include user/preface.texi
+@include user/overview.texi
+@include user/concepts.texi
+@include user/datatypes.texi
+@include user/init.texi
+@include user/task.texi
+@include user/intr.texi
+@include user/clock.texi
+@include user/timer.texi
+@include user/sem.texi
+@include user/msg.texi
+@include user/event.texi
+@include user/signal.texi
+@include user/part.texi
+@include user/region.texi
+@include user/dpmem.texi
+@include user/io.texi
+@include user/fatal.texi
+@include user/schedule.texi
+@include user/rtmon.texi
+@include user/bsp.texi
+@include user/userext.texi
+@include user/conf.texi
+@include user/mp.texi
+@include user/dirstat.texi
@include example.texi
-@include ../user/glossary.texi
+@include user/glossary.texi
@ifinfo
@node Top, Preface, (dir), (dir)
@top ada_user
--- a/doc/bsp_howto/Makefile.am
+++ b/doc/bsp_howto/Makefile.am
@@ -17,7 +17,8 @@ GENERATED_FILES = intro.texi target.texi makefiles.texi linkcmds.texi \
    support.texi adaintr.texi init.texi console.texi clock.texi timer.texi \
    rtc.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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES =

@@ -110,4 +111,6 @@ $(srcdir)/discrete.texi: discrete.t
 	    -u "Top" \
 	    -n "" < $< > $@

-EXTRA_DIST = *.t
+EXTRA_DIST = adaintr.t analog.t clock.t console.t discrete.t init.t intro.t \
+    linkcmds.t makefiles.t nvmem.t rtc.t shmsupp.t support.t target.t \
+    timer.t
--- a/doc/bsp_howto/bsp_howto.texi
+++ b/doc/bsp_howto/bsp_howto.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/common/Makefile.am
+++ b/doc/common/Makefile.am
@@ -1,8 +1,7 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-EXTRA_DIST = \
-cpright.texi setup.texi timemac.texi \
-timetbl.t treedef.tex wksheets.t timing.t
+EXTRA_DIST = cpright.texi setup.texi timemac.texi timetbl.t treedef.tex \
+    wksheets.t timing.t

--- a/doc/configure.in
+++ b/doc/configure.in
@@ -92,10 +92,6 @@ AM_CONDITIONAL(USE_PDF,
    && test x"$TEXI2DVI" != x"" \
    && test x"$TEXI2PDF" != x"" )

-AM_CONDITIONAL(USE_EXP, test x=y )
-
-BMENU='$(top_builddir)/tools/bmenu/bmenu'
-AC_SUBST(BMENU)
 BMENU2='$(top_builddir)/tools/bmenu/bmenu2'
 AC_SUBST(BMENU2)

@@ -111,8 +107,6 @@ AC_CONFIG_SUBDIRS(tools)

 AC_OUTPUT(
 Makefile
-rtems_header.html
-rtems_footer.html
 rtems_support.html
 index.html
 images/Makefile
--- a/doc/develenv/Makefile.am
+++ b/doc/develenv/Makefile.am
@@ -15,7 +15,8 @@ include $(top_srcdir)/project.am

 FILES = compile.texi direct.texi intro.texi sample.texi utils.texi

-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 info_TEXINFOS = develenv.texi
 develenv_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
--- a/doc/develenv/develenv.texi
+++ b/doc/develenv/develenv.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -63,7 +63,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/filesystem/Makefile.am
+++ b/doc/filesystem/Makefile.am
@@ -17,7 +17,8 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = preface.texi

@@ -64,4 +65,5 @@ $(srcdir)/tftp.texi: tftp.t
 	   -u "Top" \
 	   -n "" < $< > $@

-EXTRA_DIST = *.t
+EXTRA_DIST = fsrequirements.t imfs.t init.t miniimfs.t mounting.t patheval.t \
+    syscalls.t tftp.t
--- a/doc/filesystem/filesystem.texi
+++ b/doc/filesystem/filesystem.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/gnu_docs/Makefile.am
+++ b/doc/gnu_docs/Makefile.am
@@ -1,13 +1,7 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-EXTRA_DIST = \
-gnu_footer.html \
-mk_install_dir \
-Tool_Doc_Instructions \
-gnu_header.html \
-refcard.html \
-gen_docs \
-index.html \
-rtems_tools_index.html
+EXTRA_DIST = gnu_footer.html mk_install_dir Tool_Doc_Instructions \
+    gnu_header.html refcard.html gen_docs index.html rtems_tools_index.html \
+    gen_docs
--- a/doc/images/Makefile.am
+++ b/doc/images/Makefile.am
@@ -1,6 +1,6 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 html_imagesdir = $(htmldir)/images

--- a/doc/itron3.0/Makefile.am
+++ b/doc/itron3.0/Makefile.am
@@ -97,4 +97,6 @@ $(srcdir)/network.texi: network.t

 noinst_SCRIPTS = gen_all gen_section gen_status_shell

-EXTRA_DIST = *.t $(noinst_SCRIPTS)
+EXTRA_DIST = config.t eventflags.t fixedblock.t interrupt.t mailbox.t \
+    memorypool.t msgbuffer.t network.t rendezvous.t semaphore.t status.t \
+    task.t tasksync.t time.t $(noinst_SCRIPTS)
--- a/doc/itron3.0/itron.texi
+++ b/doc/itron3.0/itron.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
--- a/doc/networking/Makefile.am
+++ b/doc/networking/Makefile.am
@@ -17,14 +17,15 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = networktasks.texi preface.texi

 info_TEXINFOS = networking.texi
 networking_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

-$(PROJECT).dvi: networkflow.eps PCIreg.eps recvbd.eps
+$(PROJECT).dvi: ./networkflow.eps ./PCIreg.eps ./recvbd.eps

 PDF_IMAGES = networkflow.pdf PCIreg.pdf recvbd.pdf

@@ -65,4 +66,5 @@ $(srcdir)/decdriver.texi: decdriver.t
 PICTURE_FILES = PCIreg.eps PCIreg.jpg networkflow.eps networkflow.jpg \
    networkflow.png recvbd.eps recvbd.jpg

-EXTRA_DIST = *.t $(PICTURE_FILES)
+EXTRA_DIST = decdriver.t driver.t networkapp.t networktasks.t servers.t \
+    testing.t $(PICTURE_FILES)
--- a/doc/networking/networking.texi
+++ b/doc/networking/networking.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/new_chapters/Makefile.am
+++ b/doc/new_chapters/Makefile.am
@@ -17,7 +17,8 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES =

@@ -71,4 +72,5 @@ $(srcdir)/monitor.texi: monitor.t

 noinst_SCRIPTS = gen_section

-EXTRA_DIST = *.t STATUS TODO $(noinst_SCRIPTS)
+EXTRA_DIST = adminiface.t base.t confspace.t cpuuse.t dumpcontrol.t error.t \
+    eventlog.t monitor.t rtmonuse.t stackchk.t STATUS TODO $(noinst_SCRIPTS)
--- a/doc/new_chapters/new_chapters.texi
+++ b/doc/new_chapters/new_chapters.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -71,7 +71,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/porting/Makefile.am
+++ b/doc/porting/Makefile.am
@@ -21,7 +21,8 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 info_TEXINFOS = porting.texi
 porting_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
@@ -76,4 +77,5 @@ $(srcdir)/miscellaneous.texi: miscellaneous.t
 	    -u "Top" \
 	    -n "Command and Variable Index" < $< > $@

-EXTRA_DIST = *.t
+EXTRA_DIST = codetuning.t cpuinit.t cpumodels.t developtools.t idlethread.t \
+    interrupts.t miscellaneous.t prioritybitmap.t sourcecode.t taskcontext.t
--- a/doc/porting/porting.texi
+++ b/doc/porting/porting.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -74,7 +74,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/posix1003.1/Makefile.am
+++ b/doc/posix1003.1/Makefile.am
@@ -18,7 +18,8 @@ GENERATED_FILES = ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \
    ch13.texi ch14.texi ch15.texi ch16.texi ch17.texi ch18.texi ch19.t \
    ch19.texi

-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = preface.texi

@@ -115,10 +116,10 @@ $(srcdir)/ch18.texi: ch18.t
 	    -u "Top" \
 	    -n "Compliance Summary" < $< > $@

-ch19.t: ch01.t ch02.t ch03.t ch04.t ch05.t ch06.t ch07.t ch08.t ch09.t \
-    ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t \
+$(srcdir)/ch19.t: ch01.t ch02.t ch03.t ch04.t ch05.t ch06.t ch07.t ch08.t \
+    ch09.t ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t \
    summarize
-	./summarize >ch19.t
+	(cd $(srcdir) && ./summarize > $@)

 $(srcdir)/ch19.texi: ch19.t
 	$(BMENU2) -c -p "List of Cancellation Points" \
@@ -127,4 +128,6 @@ $(srcdir)/ch19.texi: ch19.t

 noinst_SCRIPTS = summarize

-EXTRA_DIST = *.t compliance_list summarize
+EXTRA_DIST = ch01.t ch02.t ch03.t ch04.t ch05.t ch06.t ch07.t ch08.t ch09.t \
+    ch10.t ch11.t ch12.t ch13.t ch14.t ch15.t ch16.t ch17.t ch18.t ch19.t \
+    compliance_list summarize
--- a/doc/posix1003.1/posix1003_1.texi
+++ b/doc/posix1003.1/posix1003_1.texi
@@ -21,7 +21,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -50,7 +50,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/posix_users/Makefile.am
+++ b/doc/posix_users/Makefile.am
@@ -19,11 +19,12 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = preface.texi
 info_TEXINFOS = posix_users.texi
-posix_users_TEXINFOS = $(FILES) $(GENERATED_FILES)
+posix_users_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)

 $(srcdir)/process.texi: process.t
 	 $(BMENU2) -p "" \
@@ -136,5 +137,8 @@ $(srcdir)/libm.texi: libm.t
 	    -n "" < $< > $@

 noinst_SCRIPTS = gen_size_report
-EXTRA_DIST = *.t gen_size_report
+EXTRA_DIST = cancel.t clock.t cond.t cspecific.t device.t files.t io.t key.t \
+    libc.t libm.t memorymgmt.t message.t mutex.t procenv.t process.t sched.t \
+    semaphores.t signal.t status.t systemdb.t thread.t timer.t \
+    gen_size_report

--- a/doc/posix_users/posix_users.texi
+++ b/doc/posix_users/posix_users.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -72,7 +72,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/project.am
+++ b/doc/project.am
@@ -4,6 +4,12 @@ SUFFIXES += .t

 ## Texinfo support
 TEXINFO_TEX = $(top_srcdir)/texinfo/texinfo.tex
+TEXINPUTS = $(srcdir):$(top_srcdir)
+
+.texi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) -I $(top_srcdir) `echo $< | sed 's,.*/,,'`

 $(srcdir)/stamp-vti: $(PROJECT).texi $(top_srcdir)/configure.in
 	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh \
@@ -37,13 +43,14 @@ SUFFIXES += .eps

 if EPSTOPDF
 .eps.pdf:
-	$(EPSTOPDF) $< > $@
+	$(EPSTOPDF) $< --outfile=$@
 endif

 if TEXI2PDF
 .texi.pdf:
 	TEXINPUTS=$(srcdir)/$(top_srcdir)/texinfo:$$TEXINPUTS \
-          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2PDF) $<
+          MAKEINFO='$(MAKEINFO)' \
+	  $(TEXI2PDF) $<
 endif

 $(PROJECT).pdf: $(PROJECT).texi $($(PROJECT)_TEXINFOS) $(PDF_IMAGES)
@@ -58,16 +65,27 @@ html_projectdir = $(htmldir)/$(PROJECT)

 TEXI2WWW_ARGS=\
 -I $(srcdir) \
+-I $(top_srcdir) \
 -dirfile ../index.html \
-header $(top_builddir)/rtems_header.html \
-footer $(top_builddir)/rtems_footer.html \
-icons ../images
+-header rtems_header.html \
+-footer rtems_footer.html \
+-icons $(top_builddir)/images
+
+rtems_header.html: $(top_srcdir)/rtems_header.html.in version.texi
+	@sed -e s%\.\./images/%$(top_builddir)/images/%g \
+	-e s%\@VERSION\@%@VERSION@%g \
+	< $< > $@
+rtems_footer.html: $(top_srcdir)/rtems_footer.html.in version.texi
+	@sed -e s%\.\./images/%$(top_builddir)/%g \
+	-e s%\@VERSION\@%@VERSION@%g \
+	< $< > $@

 index.html $(PROJECT)*.html: $(PROJECT).texi \
-	$(top_builddir)/rtems_header.html $(top_builddir)/rtems_footer.html
+    rtems_header.html rtems_footer.html
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -base $(PROJECT) $<

-MOSTLYCLEANFILES += index.html $(PROJECT)*.html
+MOSTLYCLEANFILES += index.html $(PROJECT)*.html rtems_header.html \
+   rtems_footer.html

 ## Common installation points
 if USE_HTML
--- a/doc/relnotes/Makefile.am
+++ b/doc/relnotes/Makefile.am
@@ -13,7 +13,8 @@ EDITION = 1

 include $(top_srcdir)/project.am

-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = install.texi intro.texi probrep.texi relnotes.texi status.texi

--- a/doc/relnotes/relnotes.texi
+++ b/doc/relnotes/relnotes.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -62,7 +62,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/rgdb_specs/Makefile.am
+++ b/doc/rgdb_specs/Makefile.am
@@ -15,7 +15,8 @@ include $(top_srcdir)/project.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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES =

@@ -76,4 +77,5 @@ $(srcdir)/conclusion.texi: conclusion.t

 noinst_DATA = layers.eps process.eps seqdetach.eps seqbreak.eps seqinit.eps

-EXTRA_DIST = *.t $(noinst_DATA) $(JPEG_FILES)
+EXTRA_DIST = comm.t conclusion.t daemon.t gdbinternals.t interfacing.t \
+    intro.t objectives.t revision.t $(noinst_DATA) $(JPEG_FILES)
--- a/doc/rgdb_specs/rgdb_specs.texi
+++ b/doc/rgdb_specs/rgdb_specs.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -50,7 +50,7 @@
@author Emmanuel Raguet and Eric Valette, Canon Research Centre
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/rtems_gdb/Makefile.am
+++ b/doc/rtems_gdb/Makefile.am
@@ -16,7 +16,8 @@ include $(top_srcdir)/project.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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES =

@@ -57,4 +58,4 @@ $(srcdir)/example.texi: example.t
 	    -u "Top" \
 	    -n "" < $< > $@

-EXTRA_DIST = *.t
+EXTRA_DIST = commands.t example.t intro.t started.t swarch.t trouble.t
--- a/doc/rtems_gdb/rtems_gdb.texi
+++ b/doc/rtems_gdb/rtems_gdb.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -50,7 +50,7 @@
@author Emmanuel Raguet and Eric Valette, Canon Research Centre
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/src2html/Makefile.am
+++ b/doc/src2html/Makefile.am
@@ -6,7 +6,7 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 PROJECT = browseable_rtems

--- a/doc/started/Makefile.am
+++ b/doc/started/Makefile.am
@@ -18,7 +18,8 @@ include $(top_srcdir)/project.am
 GENERATED_FILES = binaries.texi buildc.texi buildrt.texi gdb.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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = tversions.texi

@@ -55,7 +56,7 @@ $(srcdir)/sample.texi: sample.t tversions.texi
 	    -u "Top" \
 	    -n "Building the GNU Debugger" < $< > $@

-gdb.texi: gdb.t tversions.texi
+$(srcdir)/gdb.texi: gdb.t tversions.texi
 	$(BMENU2) -c -p "More Information on RTEMS Application Makefiles" \
 	    -u "Top" \
 	    -n "Where To Go From Here" < $< > $@
@@ -70,4 +71,5 @@ $(srcdir)/nt.texi: nt.t tversions.texi
 	    -u "Top" \
 	    -n "" < $< > $@

-EXTRA_DIST = *.t
+EXTRA_DIST = binaries.t buildc.t buildrt.t gdb.t intro.t nextstep.t nt.t \
+    require.t sample.t
--- a/doc/started/pictures/Makefile.am
+++ b/doc/started/pictures/Makefile.am
@@ -1,6 +1,6 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 PROJECT = started

@@ -10,4 +10,12 @@ if USE_HTML
 html_project_DATA += sfile12c.jpg bit_c.jpg
 endif

-EXTRA_DIST = *.jpg *.vsd
+noinst_DATA += bit_ada.jpg bit_ada.vsd bit_c.jpg bit_c.vsd scfile10.jpg \
+    scfile10.vsd scfile11.jpg scfile11.vsd scfile12.jpg scfile12.vsd \
+    scfile13.jpg scfile13.vsd scsfile1.jpg scsfile1.vsd scsfile2.jpg \
+    scsfile2.vsd scsfile3.jpg scsfile3.vsd scsfile4.jpg scsfile4.vsd \
+    scsfile5.jpg scsfile5.vsd scsfile6.jpg scsfile6.vsd scsfile7.jpg \
+    scsfile7.vsd scsfile8.jpg scsfile8.vsd scsfile9.jpg scsfile9.vsd \
+    sfile12c.jpg sfile12c.vsd
+
+EXTRA_DIST = $(noinst_DATA)
--- a/doc/started/started.texi
+++ b/doc/started/started.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@c
@c  Now set all the tool version dependent information
@@ -54,7 +54,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/started_ada/Makefile.am
+++ b/doc/started_ada/Makefile.am
@@ -16,7 +16,8 @@ include $(top_srcdir)/project.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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = tversions.texi

@@ -53,4 +54,4 @@ $(srcdir)/gdb.texi: gdb.t tversions.texi
 	    -u "Top" \
 	    -n "" < $< > $@

-EXTRA_DIST = *.t
+EXTRA_DIST = buildada.t gdb.t intro.t require.t sample.t
--- a/doc/started_ada/started_ada.texi
+++ b/doc/started_ada/started_ada.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@c
@c  Now set all the tool version dependent information
@@ -54,7 +54,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/Makefile.am
+++ b/doc/supplements/Makefile.am
@@ -1,6 +1,6 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 SUBDIRS = hppa1_1 i386 i960 m68k mips64orion powerpc sh sparc template

--- a/doc/supplements/hppa1_1/Makefile.am
+++ b/doc/supplements/hppa1_1/Makefile.am
@@ -18,7 +18,8 @@ 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/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = preface.texi

@@ -99,4 +100,5 @@ $(srcdir)/timeSIMHPPA.texi: timeSIMHPPA.t
 	    -u "Top" \
 	    -n "Command and Variable Index" < $< > $@

-EXTRA_DIST = SIMHPPA_TIMES *.t
+EXTRA_DIST = SIMHPPA_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeSIMHPPA.t
--- a/doc/supplements/hppa1_1/hppa1_1.texi
+++ b/doc/supplements/hppa1_1/hppa1_1.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/i386/Makefile.am
+++ b/doc/supplements/i386/Makefile.am
@@ -18,7 +18,8 @@ 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
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -95,15 +96,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeFORCE386.texi: $(top_srcdir)/common/timetbl.t timeFORCE386.t
-	cat timeFORCE386.t $(top_srcdir)/common/timetbl.t   >timeFORCE386_.t
+	cat $(srcdir)/timeFORCE386.t $(top_srcdir)/common/timetbl.t   >timeFORCE386_.t
 	@echo                                               >>timeFORCE386_.t
 	@echo "@tex"                                        >>timeFORCE386_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeFORCE386_.t
 	@echo "@end tex"                                    >>timeFORCE386_.t
-	${REPLACE2} -p FORCE386_TIMES timeFORCE386_.t | \
+	${REPLACE2} -p $(srcdir)/FORCE386_TIMES timeFORCE386_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeFORCE386_.t

-EXTRA_DIST = FORCE386_TIMES *.t
+EXTRA_DIST = FORCE386_TIMES bsp.t callconv.t cpumodel.t cputable.t \
+    fatalerr.t intr_NOTIMES.t memmodel.t timeFORCE386.t
--- a/doc/supplements/i386/i386.texi
+++ b/doc/supplements/i386/i386.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/i386/timeFORCE386.t
+++ b/doc/supplements/i386/timeFORCE386.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/i960/Makefile.am
+++ b/doc/supplements/i960/Makefile.am
@@ -17,7 +17,8 @@ include $(top_srcdir)/supplements/supplement.am
 GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
    fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
    timeCVME961.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -94,15 +95,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeCVME961.texi: $(top_srcdir)/common/timetbl.t timeCVME961.t
-	cat timeCVME961.t $(top_srcdir)/common/timetbl.t   >timeCVME961_.t
+	cat $(srcdir)/timeCVME961.t $(top_srcdir)/common/timetbl.t   >timeCVME961_.t
 	@echo                                               >>timeCVME961_.t
 	@echo "@tex"                                        >>timeCVME961_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeCVME961_.t
 	@echo "@end tex"                                    >>timeCVME961_.t
-	${REPLACE2} -p CVME961_TIMES timeCVME961_.t | \
+	${REPLACE2} -p $(srcdir)/CVME961_TIMES timeCVME961_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeCVME961_.t

-EXTRA_DIST = CVME961_TIMES *.t
+EXTRA_DIST = CVME961_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeCVME961.t
--- a/doc/supplements/i960/i960.texi
+++ b/doc/supplements/i960/i960.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/i960/timeCVME961.t
+++ b/doc/supplements/i960/timeCVME961.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/m68k/Makefile.am
+++ b/doc/supplements/m68k/Makefile.am
@@ -18,7 +18,8 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
    fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
    timeMVME136.texi

-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -95,15 +96,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeMVME136.texi: $(top_srcdir)/common/timetbl.t timeMVME136.t
-	cat timeMVME136.t $(top_srcdir)/common/timetbl.t   >timeMVME136_.t
+	cat $(srcdir)/timeMVME136.t $(top_srcdir)/common/timetbl.t   >timeMVME136_.t
 	@echo                                               >>timeMVME136_.t
 	@echo "@tex"                                        >>timeMVME136_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeMVME136_.t
 	@echo "@end tex"                                    >>timeMVME136_.t
-	${REPLACE2} -p MVME136_TIMES timeMVME136_.t | \
+	${REPLACE2} -p $(srcdir)/MVME136_TIMES timeMVME136_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeMVME136_.t

-EXTRA_DIST = MVME136_TIMES *.t
+EXTRA_DIST = MVME136_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeMVME136.t timedata.t
--- a/doc/supplements/m68k/m68k.texi
+++ b/doc/supplements/m68k/m68k.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -50,7 +50,7 @@
@author On-Line Applications Research Corporation
@page

-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/m68k/timeMVME136.t
+++ b/doc/supplements/m68k/timeMVME136.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/m68k/timedata.t
+++ b/doc/supplements/m68k/timedata.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/mips64orion/Makefile.am
+++ b/doc/supplements/mips64orion/Makefile.am
@@ -18,7 +18,8 @@ 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
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -95,15 +96,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t
-	cat timeBSP.t $(top_srcdir)/common/timetbl.t   >timeBSP_.t
+	cat $(srcdir)/timeBSP.t $(top_srcdir)/common/timetbl.t   >timeBSP_.t
 	@echo                                               >>timeBSP_.t
 	@echo "@tex"                                        >>timeBSP_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
 	@echo "@end tex"                                    >>timeBSP_.t
-	${REPLACE2} -p BSP_TIMES timeBSP_.t | \
+	${REPLACE2} -p $(srcdir)/BSP_TIMES timeBSP_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeBSP_.t

-EXTRA_DIST = BSP_TIMES *.t
+EXTRA_DIST = BSP_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeBSP.t
--- a/doc/supplements/mips64orion/mips64orion.texi
+++ b/doc/supplements/mips64orion/mips64orion.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -50,7 +50,7 @@
@author On-Line Applications Research Corporation
@page

-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/mips64orion/timeBSP.t
+++ b/doc/supplements/mips64orion/timeBSP.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/powerpc/Makefile.am
+++ b/doc/supplements/powerpc/Makefile.am
@@ -17,7 +17,8 @@ include $(top_srcdir)/supplements/supplement.am
 GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
    fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
    timePSIM.texi timeDMV177.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -93,16 +94,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timePSIM.texi: $(top_srcdir)/common/timetbl.t timePSIM.t
-	cat timePSIM.t $(top_srcdir)/common/timetbl.t   >timePSIM_.t
+	cat $(srcdir)/timePSIM.t $(top_srcdir)/common/timetbl.t   >timePSIM_.t
 	@echo                                               >>timePSIM_.t
 	@echo "@tex"                                        >>timePSIM_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timePSIM_.t
 	@echo "@end tex"                                    >>timePSIM_.t
-	${REPLACE2} -p PSIM_TIMES timePSIM_.t | \
+	${REPLACE2} -p $(srcdir)/PSIM_TIMES timePSIM_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "DMV177 Timing Data" > $@
-CLEANFILES += timePSIM_.t
+CLEANFILES += timePSIM_.t timeDMV177_.t

 # Timing Data for DMV177 BSP Chapter:
 #  1.  Copy the Shared File
@@ -110,15 +111,15 @@ CLEANFILES += timePSIM_.t
 #  3.  Build Node Structure

 $(srcdir)/timeDMV177.texi: $(top_srcdir)/common/timetbl.t timeDMV177.t
-	cat timeDMV177.t $(top_srcdir)/common/timetbl.t   >timeDMV177_.t
+	cat $(srcdir)/timeDMV177.t $(top_srcdir)/common/timetbl.t   >timeDMV177_.t
 	@echo                                               >>timeDMV177_.t
 	@echo "@tex"                                        >>timeDMV177_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeDMV177_.t
 	@echo "@end tex"                                    >>timeDMV177_.t
-	${REPLACE2} -p DMV177_TIMES timeDMV177_.t | \
+	${REPLACE2} -p $(srcdir)/DMV177_TIMES timeDMV177_.t | \
 	$(BMENU2) -p "PSIM Timing Data Rate Monotonic Manager" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
-CLEANFILES += timeDMV177_.t

-EXTRA_DIST = DMV177_TIMES PSIM_TIMES *.t
+EXTRA_DIST = DMV177_TIMES PSIM_TIMES bsp.t callconv.t cpumodel.t cputable.t \
+    fatalerr.t intr_NOTIMES.t memmodel.t timeDMV177.t timePSIM.t
--- a/doc/supplements/powerpc/powerpc.texi
+++ b/doc/supplements/powerpc/powerpc.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/powerpc/timeDMV177.t
+++ b/doc/supplements/powerpc/timeDMV177.t
@@ -8,7 +8,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/powerpc/timePSIM.t
+++ b/doc/supplements/powerpc/timePSIM.t
@@ -8,7 +8,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/sh/Makefile.am
+++ b/doc/supplements/sh/Makefile.am
@@ -18,7 +18,8 @@ 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
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -95,15 +96,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t
-	cat timeBSP.t $(top_srcdir)/common/timetbl.t   >timeBSP_.t
+	cat $(srcdir)/timeBSP.t $(top_srcdir)/common/timetbl.t   >timeBSP_.t
 	@echo                                               >>timeBSP_.t
 	@echo "@tex"                                        >>timeBSP_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
 	@echo "@end tex"                                    >>timeBSP_.t
-	${REPLACE2} -p BSP_TIMES timeBSP_.t | \
+	${REPLACE2} -p $(srcdir)/BSP_TIMES timeBSP_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeBSP_.t

-EXTRA_DIST = BSP_TIMES *.t
+EXTRA_DIST = BSP_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeBSP.t
--- a/doc/supplements/sh/sh.texi
+++ b/doc/supplements/sh/sh.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -50,7 +50,7 @@
@author On-Line Applications Research Corporation
@page

-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/sh/timeBSP.t
+++ b/doc/supplements/sh/timeBSP.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/sparc/Makefile.am
+++ b/doc/supplements/sparc/Makefile.am
@@ -18,7 +18,8 @@ GENERATED_FILES = cpumodel.texi callconv.texi memmodel.texi intr.texi \
    fatalerr.texi bsp.texi cputable.texi timing.texi wksheets.texi \
    timeERC32.texi

-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 FILES = preface.texi

@@ -93,15 +94,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeERC32.texi: $(top_srcdir)/common/timetbl.t timeERC32.t
-	cat timeERC32.t $(top_srcdir)/common/timetbl.t   >timeERC32_.t
+	cat $(srcdir)/timeERC32.t $(top_srcdir)/common/timetbl.t   >timeERC32_.t
 	@echo                                               >>timeERC32_.t
 	@echo "@tex"                                        >>timeERC32_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeERC32_.t
 	@echo "@end tex"                                    >>timeERC32_.t
-	${REPLACE2} -p ERC32_TIMES timeERC32_.t | \
+	${REPLACE2} -p $(srcdir)/ERC32_TIMES timeERC32_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeERC32_.t

-EXTRA_DIST = ERC32_TIMES *.t
+EXTRA_DIST = ERC32_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeERC32.t
--- a/doc/supplements/sparc/sparc.texi
+++ b/doc/supplements/sparc/sparc.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -49,7 +49,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/sparc/timeERC32.t
+++ b/doc/supplements/sparc/timeERC32.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/supplements/supplement.am
+++ b/doc/supplements/supplement.am
@@ -7,14 +7,11 @@
 REPLACE2 = $(PERL) $(top_srcdir)/tools/word-replace2

 MAINTAINERCLEANFILES += $(GENERATED_FILES)
-CLEANFILES += *.fixed
-
 html_projectdir = $(htmldir)/supplements/$(PROJECT)

 TEXI2WWW_ARGS=\
-I $(srcdir) \
+-I $(srcdir) -I $(top_srcdir) \
 -dirfile ../../index.html \
-header $(top_builddir)/rtems_header.html \
-footer $(top_builddir)/rtems_footer.html \
+-header rtems_header.html \
+-footer rtems_footer.html \
 -icons ../../images
-
--- a/doc/supplements/template/Makefile.am
+++ b/doc/supplements/template/Makefile.am
@@ -17,7 +17,8 @@ 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
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi $(top_srcdir)/common/timemac.texi

 FILES = preface.texi

@@ -94,15 +95,16 @@ $(srcdir)/timing.texi: $(top_srcdir)/common/timing.t
 #  3.  Build Node Structure

 $(srcdir)/timeBSP.texi: $(top_srcdir)/common/timetbl.t timeBSP.t
-	cat timeBSP.t $(top_srcdir)/common/timetbl.t      >timeBSP_.t
+	cat $(srcdir)/timeBSP.t $(top_srcdir)/common/timetbl.t      >timeBSP_.t
 	@echo                                               >>timeBSP_.t
 	@echo "@tex"                                        >>timeBSP_.t
 	@echo "\\global\\advance \\smallskipamount by 4pt"  >>timeBSP_.t
 	@echo "@end tex"                                    >>timeBSP_.t
-	${REPLACE2} -p BSP_TIMES timeBSP_.t | \
+	${REPLACE2} -p $(srcdir)/BSP_TIMES timeBSP_.t | \
 	$(BMENU2) -p "Timing Specification Terminology" \
 	    -u "Top" \
 	    -n "Command and Variable Index" > $@
 CLEANFILES += timeBSP_.t

-EXTRA_DIST = BSP_TIMES *.t
+EXTRA_DIST = BSP_TIMES bsp.t callconv.t cpumodel.t cputable.t fatalerr.t \
+    intr_NOTIMES.t memmodel.t timeBSP.t
--- a/doc/supplements/template/template.texi
+++ b/doc/supplements/template/template.texi
@@ -20,7 +20,7 @@
@c

@include version.texi
-@include ../../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS Target Supplements
@@ -50,7 +50,7 @@
@author On-Line Applications Research Corporation
@page

-@include ../../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.
--- a/doc/supplements/template/timeBSP.t
+++ b/doc/supplements/template/timeBSP.t
@@ -6,7 +6,7 @@
@c  $Id$
@c

-@include ../../common/timemac.texi
+@include common/timemac.texi
@tex
 \global\advance \smallskipamount by -4pt
@end tex
--- a/doc/tools/Makefile.am
+++ b/doc/tools/Makefile.am
@@ -1,13 +1,8 @@
 ## $Id$

 AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

-EXTRA_DIST = \
-word-replace2
+EXTRA_DIST = word-replace2

-SUBDIRS = \
-bmenu \
-src2html1.4a \
-src2html \
-pdl2texi \
-texi2www
+SUBDIRS = bmenu src2html1.4a src2html pdl2texi texi2www
--- a/doc/tools/bmenu/Makefile.am
+++ b/doc/tools/bmenu/Makefile.am
@@ -10,8 +10,6 @@ AUTOMAKE_OPTIONS = foreign 1.4

 noinst_PROGRAMS = bmenu2

-bmenu2_SOURCES = \
-address.h     chain.c       isr.h \
-address.inl   chain.h       bmenu2.c \
-base.h        chain.inl     system.h
+bmenu2_SOURCES = address.h chain.c isr.h address.inl chain.h bmenu2.c base.h \
+    chain.inl system.h

--- a/doc/tools/pdl2texi/Makefile.am
+++ b/doc/tools/pdl2texi/Makefile.am
@@ -6,7 +6,7 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 PROG = pdl2texi
 noinst_PROGRAMS = $(PROG)
@@ -14,10 +14,8 @@ noinst_PROGRAMS=$(PROG)
 #$(BASE).texi: $(BASE).d ./$(PROG)
 #	./$(PROG) $(BASE).d

-pdl2texi_SOURCES = \
-address.inl  chain.h      main.c       system.h \
-base.h       chain.inl    address.h    chain.c \
-isr.h
+pdl2texi_SOURCES = address.inl chain.h main.c system.h base.h chain.inl \
+    address.h chain.c isr.h

 BASE = sample

@@ -55,5 +53,5 @@ clean:
 	rm -f *.dvi *.ps *.log *.aux *.cp *.fn *.ky *.pg *.toc *.tp *.vr $(BASE)
 	rm -f test_cases/*.txt test_cases/*.texi

-EXTRA_DIST = test_cases/enum.d test_cases/enumbad.d test_cases/table.d \
-	s.d sample.d
+EXTRA_DIST = test_cases/enum.d test_cases/enumbad.d test_cases/table.d s.d \
+    sample.d
--- a/doc/tools/src2html/Makefile.am
+++ b/doc/tools/src2html/Makefile.am
@@ -6,7 +6,7 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 SRC2HTMLDIR = $(top_srcdir)/src2html1.4a

--- a/doc/tools/src2html1.4a/Ctags/Makefile.am
+++ b/doc/tools/src2html1.4a/Ctags/Makefile.am
@@ -1,10 +1,10 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 noinst_PROGRAMS = ctags-new

-ctags_new_SOURCES =	C.c ctags.c fortran.c lisp.c print.c \
-tree.c yacc.c strerror.c ctags.h
+ctags_new_SOURCES = C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c \
+    strerror.c ctags.h

 EXTRA_DIST = ctags.1 z.c
--- a/doc/tools/src2html1.4a/FreeBSD/Makefile.am
+++ b/doc/tools/src2html1.4a/FreeBSD/Makefile.am
@@ -1,21 +1,7 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

-EXTRA_DIST = \
-FreeBSD.hdr \
-FreeBSD.s2h \
-conf.hdr \
-ddb.hdr \
-i386.i386.hdr \
-i386.include.hdr \
-i386.isa.hdr \
-i386.stand.hdr \
-kern.hdr \
-net.hdr \
-netinet.hdr \
-nfs.hdr \
-stand.hdr \
-sys.hdr \
-ufs.hdr \
-vm.hdr
+EXTRA_DIST = FreeBSD.hdr FreeBSD.s2h conf.hdr ddb.hdr i386.i386.hdr \
+    i386.include.hdr i386.isa.hdr i386.stand.hdr kern.hdr net.hdr \
+    netinet.hdr nfs.hdr stand.hdr sys.hdr ufs.hdr vm.hdr
--- a/doc/tools/src2html1.4a/Makefile.am
+++ b/doc/tools/src2html1.4a/Makefile.am
@@ -1,4 +1,5 @@
-AUTOMAKE_OPTIONS = foreign
+
+AUTOMAKE_OPTIONS = foreign 1.4

 SUBDIRS = Ctags FreeBSD ctags-emacs

--- a/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
+++ b/doc/tools/src2html1.4a/ctags-emacs/Makefile.am
@@ -1,5 +1,5 @@
 ## $Id$

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 EXTRA_DIST = ctags etags.c-ada-patch README
--- a/doc/tools/texi2www/Makefile.am
+++ b/doc/tools/texi2www/Makefile.am
@@ -6,16 +6,12 @@
 #  $Id$
 #

-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4

 noinst_SCRIPTS = texi2www texi2dvi

-EXTRA_DIST = \
-$(noinst_SCRIPTS) \
-dir-arrow.gif      prev-arrow.gif \
-missing-arrow.gif  up-arrow.gif \
-next-arrow.gif \
-texi2www.texi \
+EXTRA_DIST = $(noinst_SCRIPTS) dir-arrow.gif prev-arrow.gif \
+    missing-arrow.gif up-arrow.gif next-arrow.gif texi2www.texi \
    archive/texi2www-960103.tgz

 PROJECT = texi2www
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -20,7 +20,8 @@ GENERATED_FILES = overview.texi concepts.texi datatypes.texi init.texi \
    signal.texi part.texi region.texi dpmem.texi io.texi fatal.texi \
    schedule.texi rtmon.texi bsp.texi userext.texi conf.texi mp.texi

-COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi
+COMMON_FILES = $(top_srcdir)/common/setup.texi \
+    $(top_srcdir)/common/cpright.texi

 info_TEXINFOS = c_user.texi
 c_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES)
@@ -159,4 +160,7 @@ $(srcdir)/mp.texi: mp.t

 noinst_DATA = states.gif rtemspie.gif

-EXTRA_DIST = *.t $(PNG_FILES) $(EPS_IMAGES) $(noinst_DATA)
+EXTRA_DIST = bsp.t concepts.t clock.t datatypes.t conf.t dpmem.t event.t \
+    fatal.t init.t intr.t io.t mp.t msg.t overview.t part.t region.t rtmon.t \
+    sem.t schedule.t signal.t task.t timer.t userext.t $(PNG_FILES) \
+    $(EPS_IMAGES) $(noinst_DATA)
--- a/doc/user/c_user.texi
+++ b/doc/user/c_user.texi
@@ -26,7 +26,7 @@
@c

@include version.texi
-@include ../common/setup.texi
+@include common/setup.texi

@ifset use-ascii
@dircategory RTEMS On-Line Manual
@@ -70,7 +70,7 @@
@subtitle @value{UPDATED}
@author On-Line Applications Research Corporation
@page
-@include ../common/cpright.texi
+@include common/cpright.texi
@end titlepage

@c  This prevents a black box from being printed on "overflow" lines.