This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [Ada] "doc" and "dvi" target for makefile
- From: Florian Weimer <fw at deneb dot enyo dot de>
- To: <gcc-patches at gcc dot gnu dot org>, <dewar at gnat dot com>, <brosgol at gnat dot com>,<bosch at gnat dot com>
- Date: Fri, 24 May 2002 10:18:32 +0200
- Subject: Re: [Ada] "doc" and "dvi" target for makefile
- References: <Pine.LNX.4.33.0204202033120.15365-100000@kern.srcf.societies.cam.ac.uk><87adqv0ybq.fsf@deneb.enyo.de>
Here's the updated version of the patch, after Rainer's changes have
been merged.
The generated Texinfo files which will be committed, too, are not
included in the patches below, of course.
2002-05-24 Florian Weimer <fw@deneb.enyo.de>
* contrib/gcc_update (files_and_dependencies): Add generated
Texinfo files for Ada.
* maintainer-scripts/update_web_docs (MANUALS): Include
various flavours of the GNAT User Guide.
* ada/Makefile.in, ada/Make-lang.in: Documentation is now
built in Make-lang.in. Store Info and generated Texinfo files
in the source directory.
* ada/gnat_ug.texi: Remove CVS keywords, correct version
number. Set file name correctly.
* ada/.cvsignore: Ignore generated Texinfo files.
Index: contrib/gcc_update
===================================================================
RCS file: /cvs/gcc/egcs/contrib/gcc_update,v
retrieving revision 1.35
diff -c -r1.35 gcc_update
*** contrib/gcc_update 18 Apr 2002 10:09:10 -0000 1.35
--- contrib/gcc_update 24 May 2002 08:10:01 -0000
***************
*** 76,81 ****
--- 76,85 ----
gcc/ada/sinfo.h: gcc/ada/sinfo.ads gcc/ada/xsinfo.adb
gcc/ada/nmake.adb: gcc/ada/sinfo.ads gcc/ada/nmake.adt gcc/ada/xnmake.adb
gcc/ada/nmake.ads: gcc/ada/sinfo.ads gcc/ada/nmake.adt gcc/ada/xnmake.adb
+ gcc/ada/gnat_ug_unx.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
+ gcc/ada/gnat_ug_vms.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
+ gcc/ada/gnat_ug_vxw.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
+ gcc/ada/gnat_ug_w32.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
# And libraries, at last
libf2c/configure: libf2c/configure.in
libf2c/libF77/configure: libf2c/libF77/configure.in
Index: gcc/ada/Make-lang.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/Make-lang.in,v
retrieving revision 1.10
diff -c -r1.10 Make-lang.in
*** gcc/ada/Make-lang.in 23 May 2002 18:13:28 -0000 1.10
--- gcc/ada/Make-lang.in 24 May 2002 08:10:04 -0000
***************
*** 334,342 ****
fi
ada.start.encap:
! ada.rest.encap:
! ada.info:
! ada.dvi:
ada.generated-manpages:
# Install hooks:
--- 334,455 ----
fi
ada.start.encap:
! ada.rest.encap:
!
! # Generate documentation.
! #
! # The generated Texinfo files for the User Guideare stored in
! # $(srcdir), like the Info files.
!
! ada/doctools/xgnatug : ada/xgnatug.adb
! -$(MKDIR) ada/doctools
! cp $^ ada/doctools
! cd ada/doctools && gnatmake -q xgnatug
!
! $(srcdir)/ada/gnat_ug_unx.texi : ada/doctools/xgnatug \
! $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
! ada/doctools/xgnatug unx $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_unx.texi
!
! $(srcdir)/ada/gnat_ug_vms.texi : ada/doctools/xgnatug \
! $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
! ada/doctools/xgnatug vms $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_vms.texi
!
! $(srcdir)/ada/gnat_ug_vxw.texi : ada/doctools/xgnatug \
! $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
! ada/doctools/xgnatug vxworks $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_vxw.texi
!
! $(srcdir)/ada/gnat_ug_wnt.texi : ada/doctools/xgnatug \
! $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words
! 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
! 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
! 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
! 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
! 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
! 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 \
! $(srcdir)/doc/include/fdl.texi
! cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat-style.info ada/gnat-style.texi
!
! ada.info: $(srcdir)/ada/gnat_ug_vms.info $(srcdir)/ada/gnat_ug_wnt.info \
! $(srcdir)/ada/gnat_ug_unx.info $(srcdir)/ada/gnat_ug_vxw.info \
! $(srcdir)/ada/gnat_rm.info $(srcdir)/ada/gnat-style.info
!
! ada.install-info:
! -rm -f $(infodir)/gnat_ug_*.info*
! -rm -f $(infodir)/gnat_rm.info*
! -rm -f $(infodir)/gnat-style.info*
! if [ -f $(srcdir)/ada/gnat_ug_unx.info ]; then \
! for f in $(srcdir)/ada/gnat_ug_*.info* \
! $(srcdir)/ada/gnat_rm.info* \
! $(srcdir)/ada/gnat-style.info*; do \
! realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
! $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
! done; \
! else true; fi
! -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
! if [ -f $(infodir)/dir ] ; then \
! for f in gnat_ug_vms.info gnat_ug_wnt.info gnat_ug_unx.info \
! gnat_ug_vxw.info gnat_rm.info gnat-style.info; do \
! if [ -f $(infodir)/$$f ]; then \
! install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
! else true; fi; \
! done; \
! else true; fi; \
! else true; fi;
! -chmod a-x $(infodir)/gnat_ug_vms.info* $(infodir)/gnat_ug_wnt.info*
! -chmod a-x $(infodir)/gnat_ug_unx.info* $(infodir)/gnat_ug_vxw.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
! 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
! 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
! 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
! 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
! s=`cd $(srcdir); ${PWD}`; \
! cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi
!
! ada/gnat-style.dvi : $(srcdir)/ada/gnat-style.texi \
! $(srcdir)/doc/include/fdl.texi
! s=`cd $(srcdir); ${PWD}`; \
! cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat-style.dvi $$s/ada/gnat-style.texi
!
! ada.dvi: ada/gnat_ug_vms.dvi ada/gnat_ug_wnt.dvi \
! ada/gnat_ug_unx.dvi ada/gnat_ug_vxw.dvi \
! ada/gnat_rm.dvi ada/gnat-style.dvi
!
ada.generated-manpages:
# Install hooks:
Index: gcc/ada/Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/Makefile.in,v
retrieving revision 1.32
diff -c -r1.32 Makefile.in
*** gcc/ada/Makefile.in 23 May 2002 18:13:28 -0000 1.32
--- gcc/ada/Makefile.in 24 May 2002 08:10:05 -0000
***************
*** 2022,2063 ****
$(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
b_gnatm.o : b_gnatm.c
- # We remove the generated .texi files to force regeneration.
- doctools/xgnatug : xgnatug.adb
- -$(MKDIR) doctools
- $(CP) $^ doctools
- (cd doctools ; gnatmake -q xgnatug)
- -rm gnat_ug_*.texi
-
- # We cannot list the dependency on the xgnatug binary here because we
- # have to (a) use the VPATH feature, and (b) include the target flag.
- gnat_ug_vms.texi : gnat_ug.texi ug_words
- doctools/xgnatug vms $^
-
- gnat_ug_wnt.texi : gnat_ug.texi ug_words
- doctools/xgnatug wnt $^
-
- gnat_ug_unx.texi : gnat_ug.texi ug_words
- doctools/xgnatug unx $^
-
- gnat_ug_vxw.texi : gnat_ug.texi ug_words
- doctools/xgnatug vxworks $^
-
- %.info : %.texi
- $(MAKEINFO) -I $(srcdir)/../doc/include -o $@ $<
-
- %.dvi : %.texi
- $(TEXI2DVI) -I $(srcdir)/../doc/include $<
-
- # List the dependency on the xgnatug binary explicitly (see above).
- doc : doctools/xgnatug \
- gnat_ug_vms.info gnat_ug_wnt.info gnat_ug_unx.info gnat_ug_vxw.info \
- gnat_rm.info gnat-style.info
-
- dvi : doctools/xgnatug \
- gnat_ug_vms.dvi gnat_ug_wnt.dvi gnat_ug_unx.dvi gnat_ug_vxw.dvi \
- gnat_rm.dvi gnat-style.dvi
-
# force debugging information on s-tasdeb.o so that it is always
# possible to set conditional breakpoints on tasks.
--- 2022,2027 ----
Index: gcc/ada/gnat_ug.texi
===================================================================
RCS file: /cvs/gcc/egcs/gcc/ada/gnat_ug.texi,v
retrieving revision 1.2
diff -c -r1.2 gnat_ug.texi
*** gcc/ada/gnat_ug.texi 21 Apr 2002 12:56:01 -0000 1.2
--- gcc/ada/gnat_ug.texi 24 May 2002 08:10:23 -0000
***************
*** 7,14 ****
@c o
@c G N A T _ U G o
@c o
- @c $Revision: 1.2 $
- @c o
@c Copyright (C) 1992-2002 Ada Core Technologies, Inc. o
@c o
@c GNAT is free software; you can redistribute it and/or modify it under o
--- 7,12 ----
***************
*** 56,78 ****
@c
@c oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
- @setfilename gnat_ug.info
@ifset vms
@settitle GNAT User's Guide for OpenVMS Alpha
@end ifset
@ifset wnt
@settitle GNAT User's Guide for Windows NT
@end ifset
@ifset unx
@settitle GNAT User's Guide for Unix Platforms
@end ifset
@ifset vxworks
@settitle GNAT User's Guide for Cross Platforms
@end ifset
@setchapternewpage odd
@syncodeindex fn cp
@c %**end of header
--- 54,81 ----
@c
@c oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
@ifset vms
+ @setfilename gnat_ug_vms.info
@settitle GNAT User's Guide for OpenVMS Alpha
@end ifset
@ifset wnt
+ @setfilename gnat_ug_wnt.info
@settitle GNAT User's Guide for Windows NT
@end ifset
@ifset unx
+ @setfilename gnat_ug_unx.info
@settitle GNAT User's Guide for Unix Platforms
@end ifset
@ifset vxworks
+ @setfilename gnat_ug_vxw.info
@settitle GNAT User's Guide for Cross Platforms
@end ifset
+ @include gcc-common.texi
+
@setchapternewpage odd
@syncodeindex fn cp
@c %**end of header
***************
*** 100,108 ****
@end ifset
@subtitle GNAT, The GNU Ada 95 Compiler
! @subtitle Document revision level $Revision: 1.2 $
! @subtitle GNAT Version 3.16w
! @subtitle Date: $Date: 2002/04/21 12:56:01 $
@author Ada Core Technologies, Inc.
--- 103,109 ----
@end ifset
@subtitle GNAT, The GNU Ada 95 Compiler
! @subtitle GNAT Version for GCC @value{version-GCC}
@author Ada Core Technologies, Inc.
***************
*** 156,164 ****
GNAT, The GNU Ada 95 Compiler
! GNAT Version 3.16w
!
! Date: $Date: 2002/04/21 12:56:01 $
Ada Core Technologies, Inc.
--- 157,163 ----
GNAT, The GNU Ada 95 Compiler
! GNAT Version for GCC @value{version-GCC}
Ada Core Technologies, Inc.
Index: maintainer-scripts/update_web_docs
===================================================================
RCS file: /cvs/gcc/egcs/maintainer-scripts/update_web_docs,v
retrieving revision 1.17
diff -c -r1.17 update_web_docs
*** maintainer-scripts/update_web_docs 21 Apr 2002 13:50:09 -0000 1.17
--- maintainer-scripts/update_web_docs 24 May 2002 08:10:39 -0000
***************
*** 94,100 ****
# and fdl.texi.
includedir=gcc/gcc/doc/include
! MANUALS="cpp cppinternals gcc gccint gcj g77 gnat-style gnat_rm libiberty porting"
# Now convert the relevant files from texi to HTML and PostScript.
for file in $MANUALS; do
--- 94,100 ----
# and fdl.texi.
includedir=gcc/gcc/doc/include
! MANUALS="cpp cppinternals gcc gccint gcj g77 gnat_ug_unx gnat_ug_vms gnat_ug_vxw gnat_ug_wnt gnat-style gnat_rm libiberty porting"
# Now convert the relevant files from texi to HTML and PostScript.
for file in $MANUALS; do
*** /dev/null Fri Mar 15 20:03:43 2002
--- gcc/ada/.cvsignore Mon May 20 14:57:20 2002
***************
*** 0 ****
--- 1,6 ----
+ gnat_ug_unx.info*
+ gnat_ug_vms.info*
+ gnat_ug_vxw.info*
+ gnat_ug_wnt.info*
+ gnat_rm.info*
+ gnat-style.info*