gcc-common.texi: Define DEVELOPMENT.

* 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. From-SVN: r60446
2002-12-23 19:26:48 +00:00 · 2002-12-23 19:26:48 +00:00 · 46d40353c3
commit 46d40353c3
parent 9536ca346b
17 changed files with 88 additions and 94 deletions
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@ -1,3 +1,7 @@
+2002-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* doc/include/gcc-common.texi: Define DEVELOPMENT.
+
 2002-12-23  Mark Mitchell  <mark@codesourcery.com>

 	* stor-layout.c (update_alignment_for_field): Correct handling of
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@ -1,3 +1,14 @@
+2002-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* 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.
+
 2002-12-15   Geert Bosch <bosch@gnat.com>

 	* sem_ch6.adb (Analyze_Subprogram_Body): Fix typo and formatting
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@ -366,23 +366,23 @@ $(srcdir)/ada/gnat_ug_wnt.texi : ada/doctools/xgnatug \
 	ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_wnt.texi

 $(srcdir)/ada/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_unx.info ada/gnat_ug_unx.texi

 $(srcdir)/ada/gnat_ug_vms.info : $(srcdir)/ada/gnat_ug_vms.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vms.info ada/gnat_ug_vms.texi

 $(srcdir)/ada/gnat_ug_vxw.info : $(srcdir)/ada/gnat_ug_vxw.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vxw.info ada/gnat_ug_vxw.texi

 $(srcdir)/ada/gnat_ug_wnt.info : $(srcdir)/ada/gnat_ug_wnt.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_wnt.info ada/gnat_ug_wnt.texi

 $(srcdir)/ada/gnat_rm.info : $(srcdir)/ada/gnat_rm.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_rm.info ada/gnat_rm.texi

 $(srcdir)/ada/gnat-style.info : $(srcdir)/ada/gnat-style.texi \
@ -420,27 +420,27 @@ ada.install-info:
 	-chmod a-x $(infodir)/gnat_rm.info* $(infodir)/gnat-style.info*

 ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; \
 	cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_unx.dvi $$s/ada/gnat_ug_unx.texi

 ada/gnat_ug_vms.dvi : $(srcdir)/ada/gnat_ug_vms.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; \
 	cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vms.dvi $$s/ada/gnat_ug_vms.texi

 ada/gnat_ug_vxw.dvi : $(srcdir)/ada/gnat_ug_vxw.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; \
 	cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vxw.dvi $$s/ada/gnat_ug_vxw.texi

 ada/gnat_ug_wnt.dvi : $(srcdir)/ada/gnat_ug_wnt.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; \
 	cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_wnt.dvi $$s/ada/gnat_ug_wnt.texi

 ada/gnat_rm.dvi : $(srcdir)/ada/gnat_rm.texi \
-	$(srcdir)/doc/include/fdl.texi
+	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; \
 	cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi

--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@ -8,7 +8,7 @@
@c                                                                            o
@c                              G N A T _ RM                                  o
@c                                                                            o
-@c                            $Revision: 1.3.8.1 $
+@c                            $Revision: 1.8 $
@c                                                                            o
@c              Copyright (C) 1995-2002 Free Software Foundation              o
@c                                                                            o
@ -22,6 +22,8 @@
@setchapternewpage odd
@syncodeindex fn cp

+@include gcc-common.texi
+
@dircategory GNU Ada tools
@direntry
 * GNAT Reference Manual: (gnat_rm).  Reference Manual for GNU Ada tools.
@ -31,12 +33,7 @@

@title GNAT Reference Manual
@subtitle GNAT, The GNU Ada 95 Compiler
-@ifset vxworks
-@title Version 3.16w
-@end ifset
-@ifclear vxworks
-@subtitle Version 3.16w
-@end ifclear
+@subtitle GNAT Version for GCC @value{version-GCC}
@author Ada Core Technologies, Inc.

@page
@ -64,12 +61,7 @@ GNAT Reference Manual

 GNAT, The GNU Ada 95 Compiler

-@ifset vxworks
-Version 3.16w
-@end ifset
-@ifclear vxworks
-Version 3.16w
-@end ifclear
+GNAT Version for GCC @value{version-GCC}

 Ada Core Technologies, Inc.

--- a/gcc/doc/include/gcc-common.texi
+++ b/gcc/doc/include/gcc-common.texi
@ -6,6 +6,11 @@

@set version-GCC 3.4

+@c DEVELOPMENT is set to indicate an in-development version,
+@c as compared to a release version.  When making a release
+@c branch, clear this.
+@set DEVELOPMENT
+
@c Common macros to support generating man pages:

@macro gcctabopt{body}
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@ -1,3 +1,12 @@
+2002-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* 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.
+
 2002-12-19  Kazu Hirata  <kazu@cs.umass.edu>

 	* intdoc.in: Fix typos.
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@ -153,7 +153,8 @@ $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
 		$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
 		$(srcdir)/doc/include/gpl.texi \
-		$(srcdir)/doc/include/funding.texi
+		$(srcdir)/doc/include/funding.texi \
+		$(srcdir)/doc/include/gcc-common.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(srcdir)/f/g77.info-*; \
 	  cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \
@ -164,7 +165,8 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
 		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
 		$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
 		$(srcdir)/doc/include/gpl.texi \
-		$(srcdir)/doc/include/funding.texi
+		$(srcdir)/doc/include/funding.texi \
+		$(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; export s; \
 	cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi

--- a/gcc/f/bugs.texi
+++ b/gcc/f/bugs.texi
@ -1,4 +1,4 @@
-@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
@c This is part of the G77 manual.
@c For copying conditions, see the file g77.texi.

@ -11,9 +11,8 @@

@set last-update-bugs 2002-02-01

-@include root.texi
-
@ifset DOC-BUGS
+@include root.texi
@c The immediately following lines apply to the BUGS file
@c which is derived from this file.
@emph{Note:} This file is automatically generated from the files
--- a/gcc/f/g77.texi
+++ b/gcc/f/g77.texi
@ -24,33 +24,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
-
-@macro gcctabopt{body}
-@code{\body\}
-@end macro
-@macro gccoptlist{body}
-@smallexample
-\body\
-@end smallexample
-@end macro
-@c Makeinfo handles the above macro OK, TeX needs manual line breaks;
-@c they get lost at some point in handling the macro.  But if @macro is
-@c used here rather than @alias, it produces double line breaks.
-@iftex
-@alias gol = *
-@end iftex
-@ifnottex
-@macro gol
-@end macro
-@end ifnottex
-
@ifset INTERNALS
@ifset USING
@settitle Using and Porting GNU Fortran
@ -142,7 +115,6 @@ Inspired by a first pass at translating @file{g77-0.5.16/f/DOC} that
 was contributed to Craig by David Ronis (@email{ronis@@onsager.chem.mcgill.ca}).

@setchapternewpage odd
-@c @finalout
@titlepage
@ifset INTERNALS
@ifset USING
--- a/gcc/f/news.texi
+++ b/gcc/f/news.texi
@ -12,9 +12,8 @@

@set last-update-news 2002-11-19

-@include root.texi
-
@ifset DOC-NEWS
+@include root.texi
@c The immediately following lines apply to the NEWS file
@c which is derived from this file.
@emph{Note:} This file is automatically generated from the files
--- a/gcc/f/root.texi
+++ b/gcc/f/root.texi
@ -1,9 +1,4 @@
-@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.
-@set DEVELOPMENT
-@set version-gcc 3.4
+@include gcc-common.texi

@set email-general gcc@@gcc.gnu.org
@set email-help gcc-help@@gcc.gnu.org
@ -12,7 +7,7 @@
@set path-g77 gcc/gcc/f
@set path-libf2c gcc/libf2c

-@set which-g77 GCC-@value{version-gcc}
+@set which-g77 GCC-@value{version-GCC}
@set which-gcc GCC

@set email-burley craig@@jcb-sc.com
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@ -1,3 +1,9 @@
+2002-12-23  Joseph S. Myers  <jsm@polyomino.org.uk>
+
+	* gcj.texi: Include gcc-common.texi.
+	* Make-lang.in ($(srcdir)/java/gcj.info, java/gcj.dvi): Depend on
+	$(srcdir)/doc/include/gcc-common.texi.
+
 2002-12-22  Anthony Green  <green@redhat.com>

 	* gcj.texi (Limitations): Add note about org.xml.sax and
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@ -347,14 +347,15 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \

 # Documentation
 $(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi \
-	 $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi
+	 $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi \
+	 $(srcdir)/doc/include/gcc-common.texi
 	if test "x$(BUILD_INFO)" = xinfo; then \
 	  rm -f $(srcdir)/java/gcc.info*; \
 	  cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o gcj.info gcj.texi; \
 	else true; fi

 java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \
-	 $(srcdir)/doc/include/gpl.texi
+	 $(srcdir)/doc/include/gpl.texi $(srcdir)/doc/include/gcc-common.texi
 	s=`cd $(srcdir); ${PWD}`; export s; \
 	cd java && $(TEXI2DVI) -I $$s/doc/include $$s/java/gcj.texi

--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@ -2,6 +2,8 @@
@setfilename gcj.info
@settitle Guide to GNU gcj

+@include gcc-common.texi
+
@c Note: When reading this manual you'll find lots of strange
@c circumlocutions like ``compiler for the Java language''.
@c This is necessary due to Sun's restrictions on the use of
@ -11,12 +13,7 @@
@set copyrights-gcj 2001, 2002

@c Versions
-@set version-gcc 3.4
-@set which-gcj GCC-@value{version-gcc}
-
-@macro gcctabopt{body}
-@code{\body\}
-@end macro
+@set which-gcj GCC-@value{version-GCC}

@ifinfo
@format
--- 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.
--- 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:

--- 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