* doc/include/gcc-common.texi: Define DEVELOPMENT.

ada:
	* gnat_rm.texi: Include gcc-common.texi.  Use GCC version number
	only.
	* Make-lang.in ($(srcdir)/ada/gnat_ug_unx.info,
	$(srcdir)/ada/gnat_ug_vms.info, $(srcdir)/ada/gnat_ug_vxw.info,
	$(srcdir)/ada/gnat_ug_wnt.info, $(srcdir)/ada/gnat_rm.info,
	ada/gnat_ug_unx.dvi, ada/gnat_ug_vms.dvi, ada/gnat_ug_vxw.dvi,
	ada/gnat_ug_wnt.dvi, ada/gnat_rm.dvi): Depend on
	$(srcdir)/doc/include/gcc-common.texi.

f:
	* root.texi: Include gcc-common.texi.
	* bugs.texi, news.texi: Don't include root.texi as part of full
	manual.
	* g77.texi: Update for use of gcc-common.texi.
	* Make-lang.in ($(srcdir)/f/g77.info, f/g77.dvi): Depend on
	$(srcdir)/doc/include/gcc-common.texi.

java:
	* gcj.texi: Include gcc-common.texi.
	* Make-lang.in ($(srcdir)/java/gcj.info, java/gcj.dvi): Depend on
	$(srcdir)/doc/include/gcc-common.texi.

treelang:
	* treelang.texi: Include gcc-common.texi.
	* Make-lang.in ($(srcdir)/treelang/treelang.info, treelang.dvi):
	Depend on gcc-common.texi.  Add other missing dependencies.
	(treelang.dvi): Use texi2dvi.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60446 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 23 insertions, 21 deletions

diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 587275667e0..a40952b8006 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* treelang.texi: Include gcc-common.texi.
+	* Make-lang.in ($(srcdir)/treelang/treelang.info, treelang.dvi):
+	Depend on gcc-common.texi.  Add other missing dependencies.
+	(treelang.dvi): Use texi2dvi.
+
 2002-12-22  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	* treelang.texi: Use @ifnottex instead of @ifinfo.
diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in
index 79da1a6df8f..c7ac6652996 100644
--- a/gcc/treelang/Make-lang.in
+++ b/gcc/treelang/Make-lang.in
@@ -132,15 +132,21 @@ treelang.rest.encap:
 .phony:treelang.info
 treelang.info: $(srcdir)/treelang/treelang.info
 
-$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi
+$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi \
+	 $(srcdir)/doc/include/gcc-common.texi \
+	 $(srcdir)/doc/include/gpl.texi \
+	 $(srcdir)/doc/include/fdl.texi \
+	 $(srcdir)/doc/include/funding.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc/include \
 	-o treelang/treelang.info treelang/treelang.texi
 
-treelang.dvi: $(srcdir)/treelang/treelang.texi
-	TEXINPUTS=$(srcdir)/treelang:$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/treelang/treelang.texi; \
-	  texindex treelang.??; \
-	  TEXINPUTS=$(srcdir)/treelang:$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/treelang/treelang.texi; \
-	  mv treelang.dvi treelang;
+treelang.dvi: $(srcdir)/treelang/treelang.texi \
+	 $(srcdir)/doc/include/gcc-common.texi \
+	 $(srcdir)/doc/include/gpl.texi \
+	 $(srcdir)/doc/include/fdl.texi \
+	 $(srcdir)/doc/include/funding.texi
+	s=`cd $(srcdir); ${PWD}`; export s; \
+	cd treelang && $(TEXI2DVI) -I $$s/doc/include $$s/treelang/treelang.texi
 
 treelang.generated-manpages:
 
diff --git a/gcc/treelang/treelang.texi b/gcc/treelang/treelang.texi
index 4c496fc621b..1104d8171a7 100644
--- a/gcc/treelang/treelang.texi
+++ b/gcc/treelang/treelang.texi
@@ -8,15 +8,12 @@
 @c %**start of header
 @setfilename treelang.info
 
+@include gcc-common.texi
+
+@set version-treelang 1.0
+
 @set last-update 2001-07-30
 @set copyrights-treelang 1995,1996,1997,1998,1999,2000,2001,2002
-@c DEVELOPMENT is set to indicate an in-development version,
-@c as compared to a release version.  When making a release
-@c (e.g. a release branch in the CVS repository for GCC),
-@c clear this and set the version information correctly.
-@clear DEVELOPMENT
-@set version-treelang 1.0
-@set version-GCC 3.0
 
 @set email-general gcc@@gcc.gnu.org
 @set email-bugs gcc-bugs@@gcc.gnu.org or bug-gcc@@gnu.org
@@ -46,14 +43,6 @@
 @c and make sure the following does NOT begin with '@c':
 @c @clear USING
 
-@c 6/27/96 FSF DO wants smallbook fmt for 1st bound edition. (from gcc.texi)
-@c @smallbook
-
-@c i also commented out the finalout command, so if there *are* any
-@c overfulls, you'll (hopefully) see the rectangle in the right hand
-@c margin. -- burley 1999-03-13 (from mew's comment in GCC.texi).
-@c @finalout
-
 @ifset INTERNALS
 @ifset USING
 @settitle Using and Maintaining GNU Treelang