Documentation generation patch [Take 2]

[Theodore Papadopoulo]

jsm28@cam.ac.uk said:
> c-tree.dvi now needs to depend on fdl.texi as well. 

Indeed. I did that and also updated the dependencies for gcc.dvi, 
gcc.info and c-tree.info. The updated patch is below.

> Could you investigate whether, in all places where GCC currently uses
> this idiom, texi2dvi could be used instead (with -I $(srcdir) to find
> the files)?  The following comment appears in f/Make-lang.in, but I
> wonder  whether with current (4.0 or greater) texinfo, and the -I
> option used as  the official way to find input files, it is necessary,
> or whether texi2dvi  could be used throughout. 
> [...]
> I don't see any problem with this patch once the missing dependency is
> added, though I'm not qualified to approve it.  But I think that
> changing to use texi2dvi would be a useful followup patch, if it
> works.  (Of course, use $(TEXI2DVI) rather than hardcoded texi2dvi.) 

OK, will do that.

	Theo.


2001-05-11  Theodore Papadopoulo  <Theodore.Papadopoulo@sophia.inria.fr>

	* Makefile.in (dvi): Add generation for the c-tree cppinternals and
	documentations. Added dependencies on fdl.texi where appropriate.
	(info): Added dependencies on fdl.texi where appropriate.

Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/Makefile.in,v
retrieving revision 1.658
diff -c -3 -p -r1.658 Makefile.in
*** Makefile.in	2001/05/09 14:16:45	1.658
--- Makefile.in	2001/05/10 09:44:32
*************** $(srcdir)/cpp.info: $(srcdir)/cpp.texi
*** 2247,2256 ****
  $(srcdir)/gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
  	  $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
  	  $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi \
! 	  $(srcdir)/objc.texi
  	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o gcc.info gcc.texi
  
! $(srcdir)/c-tree.info: $(srcdir)/c-tree.texi
  	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o c-tree.info \
  		c-tree.texi
  
--- 2247,2256 ----
  $(srcdir)/gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
  	  $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
  	  $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi \
! 	  $(srcdir)/objc.texi $(srcdir)/fdl.texi
  	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o gcc.info gcc.texi
  
! $(srcdir)/c-tree.info: $(srcdir)/c-tree.texi $(srcdir)/fdl.texi
  	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o c-tree.info \
  		c-tree.texi
  
*************** $(srcdir)/cppinternals.info: $(srcdir)/c
*** 2258,2270 ****
  	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cppinternals.info \
  		cppinternals.texi
  
! dvi: gcc.dvi cpp.dvi lang.dvi
  
  # This works with GNU Make's default rule.
  gcc.dvi: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
  	 $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
  	 $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi \
! 	 $(srcdir)/objc.texi
  	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex gcc.texi
  	texindex gcc.??
  	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex gcc.texi
--- 2258,2270 ----
  	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cppinternals.info \
  		cppinternals.texi
  
! dvi: gcc.dvi cpp.dvi lang.dvi c-tree.dvi cppinternals.dvi
  
  # This works with GNU Make's default rule.
  gcc.dvi: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
  	 $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
  	 $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi \
! 	 $(srcdir)/objc.texi $(srcdir)/fdl.texi
  	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex gcc.texi
  	texindex gcc.??
  	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex gcc.texi
*************** cpp.dvi: $(srcdir)/cpp.texi
*** 2273,2278 ****
--- 2273,2288 ----
  	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cpp.texi
  	texindex cpp.??
  	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cpp.texi
+ 
+ c-tree.dvi: $(srcdir)/c-tree.texi $(srcdir)/fdl.texi
+ 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex c-tree.texi
+ 	texindex c-tree.??
+ 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex c-tree.texi
+ 
+ cppinternals.dvi: $(srcdir)/cppinternals.texi
+ 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cppinternals.texi
+ 	texindex cppinternals.??
+ 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cppinternals.texi
  
  generated-manpages: $(srcdir)/gcov.1 $(srcdir)/cpp.1 $(srcdir)/gcc.1
  
--------------------------------------------------------------------
Theodore Papadopoulo
Email: Theodore.Papadopoulo@sophia.inria.fr Tel: (33) 04 92 38 76 01
 --------------------------------------------------------------------


-- 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.4 (GNU/Linux)
Comment: Exmh version 2.2 06/23/2000

iD8DBQE6+mSBIzTj8qrxOU4RAjkpAKC8uHF3FEfYUaq5UnLwNc9tA7iHbwCeLBQg
P9Bvj0L6Vz0GlYht+yCStcc=
=4p2j
-----END PGP SIGNATURE-----