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/project.am | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'doc/project.am') diff --git a/doc/project.am b/doc/project.am index d4c47a44f4..a624b55bc0 100644 --- 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 -- cgit v1.2.3