From 110445cba5510f44c0fbd2ff13d7126459c188c6 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 10 Jun 2000 19:41:09 +0000 Subject: Patch rtems-rc-4.5.0-21.diff from Ralf Corsepius 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/ * %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 --- doc/started/Makefile.am | 8 +++++--- doc/started/pictures/Makefile.am | 12 ++++++++++-- doc/started/started.texi | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) (limited to 'doc/started') diff --git a/doc/started/Makefile.am b/doc/started/Makefile.am index e1782be731..41e1141390 100644 --- 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 diff --git a/doc/started/pictures/Makefile.am b/doc/started/pictures/Makefile.am index 45e81830b1..85c8bb807a 100644 --- 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) diff --git a/doc/started/started.texi b/doc/started/started.texi index 399949d11f..853b646d94 100644 --- 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. -- cgit v1.2.3