From 961457a8dcb5c3e2d90171aff1e1395631955e60 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 17 Nov 2012 12:30:37 -0800 Subject: [PATCH] rename info files --- gcc/Makefile.in | 74 +++++++++++++++++++++++++++++++++++++---------- gcc/ada/gnat-style.texi | 2 +- gcc/ada/gnat_rm.texi | 2 +- gcc/doc/cpp.texi | 2 +- gcc/doc/cppinternals.texi | 2 +- gcc/doc/extend.texi | 2 +- gcc/doc/gcc.texi | 6 ++-- gcc/doc/gccint.texi | 4 +-- gcc/doc/install.texi | 2 +- gcc/doc/invoke.texi | 8 ++--- gcc/doc/libgcc.texi | 2 +- gcc/doc/makefile.texi | 2 +- gcc/doc/passes.texi | 2 +- gcc/doc/standards.texi | 4 +-- gcc/fortran/Make-lang.in | 11 +++---- gcc/fortran/gfortran.texi | 2 +- gcc/java/Make-lang.in | 19 ++++++++++-- gcc/java/gcj.texi | 16 +++++----- libgomp/Makefile.am | 13 +++++---- libgomp/Makefile.in | 14 +++++---- libgomp/libgomp.texi | 2 +- 21 files changed, 126 insertions(+), 65 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 47a9489..c2edec4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4244,8 +4244,27 @@ install-no-fixedincludes: doc: $(BUILD_INFO) $(GENERATED_MANPAGES) -INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \ - doc/gccinstall.info doc/cppinternals.info +INFO_CPP_NAME = $(shell echo cpp|sed '$(program_transform_name)') +INFO_GCC_NAME = $(shell echo gcc|sed '$(program_transform_name)') +INFO_GXX_NAME = $(shell echo g++|sed '$(program_transform_name)') +INFO_GCCINT_NAME = $(shell echo gccint|sed '$(program_transform_name)') +INFO_GCCINSTALL_NAME = $(shell echo gccinstall|sed '$(program_transform_name)') +INFO_CPPINT_NAME = $(shell echo cppinternals|sed '$(program_transform_name)') + +INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)') +INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)') + +INFOFILES = doc/$(INFO_CPP_NAME).info doc/$(INFO_GCC_NAME).info \ + doc/$(INFO_GCCINT_NAME).info \ + doc/$(INFO_GCCINSTALL_NAME).info doc/$(INFO_CPPINT_NAME).info + +MAKEINFODEFS = -D 'fncpp $(INFO_CPP_NAME)' -D 'fngcc $(INFO_GCC_NAME)' \ + -D 'fngxx $(INFO_GXX_NAME)' \ + -D 'fngccint $(INFO_GCCINT_NAME)' \ + -D 'fngccinstall $(INFO_GCCINSTALL_NAME)' \ + -D 'fncppint $(INFO_CPPINT_NAME)' \ + -D 'fngfortran $(INFO_FORTRAN_NAME)' \ + -D 'fngcj $(INFO_GCJ_NAME)' info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo @@ -4299,21 +4318,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE) # patterns. To use them, put each of the specific targets with its # specific dependencies but no build commands. -doc/cpp.info: $(TEXI_CPP_FILES) -doc/gcc.info: $(TEXI_GCC_FILES) -doc/gccint.info: $(TEXI_GCCINT_FILES) -doc/cppinternals.info: $(TEXI_CPPINT_FILES) - +# Generic entry to handle info files, which are not renamed (currently Ada) doc/%.info: %.texi if [ x$(BUILD_INFO) = xinfo ]; then \ $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ -I $(gcc_docdir)/include -o $@ $<; \ fi +doc/$(INFO_CPP_NAME).info: $(TEXI_CPP_FILES) + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + +doc/$(INFO_GCC_NAME).info: $(TEXI_GCC_FILES) + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + +doc/$(INFO_GCCINT_NAME).info: $(TEXI_GCCINT_FILES) + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + +doc/$(INFO_CPPINT_NAME).info: $(TEXI_CPPINT_FILES) + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + # Duplicate entry to handle renaming of gccinstall.info -doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) +doc/$(INFO_GCCINSTALL_NAME).info: $(TEXI_GCCINSTALL_FILES) if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \ + $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ -I $(gcc_docdir)/include -o $@ $<; \ fi @@ -4674,11 +4713,11 @@ install-driver: installdirs xgcc$(exeext) # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. install-info:: doc installdirs \ - $(DESTDIR)$(infodir)/cpp.info \ - $(DESTDIR)$(infodir)/gcc.info \ - $(DESTDIR)$(infodir)/cppinternals.info \ - $(DESTDIR)$(infodir)/gccinstall.info \ - $(DESTDIR)$(infodir)/gccint.info \ + $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info \ + $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info \ + $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info \ + $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info \ + $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info \ lang.install-info $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs @@ -4885,8 +4924,11 @@ uninstall: lang.uninstall -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext) -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) - -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info* - -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info* + -rm -f $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info* + -rm -f $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info* + -rm -f $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info* + -rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info* + -rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info* for i in ar nm ranlib ; do \ install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\ target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \ diff --git a/gcc/ada/gnat-style.texi b/gcc/ada/gnat-style.texi index 1bba703..81c2e61 100644 --- a/gcc/ada/gnat-style.texi +++ b/gcc/ada/gnat-style.texi @@ -31,7 +31,7 @@ Texts. A copy of the license is included in the section entitled @dircategory Software development @direntry -* gnat-style: (gnat-style). GNAT Coding Style +* gnat-style: (gnat-style-4.7). GNAT Coding Style @end direntry @macro syntax{element} diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index 9b10794..fa4a50c 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -38,7 +38,7 @@ included in the section entitled ``GNU Free Documentation License''. @dircategory GNU Ada tools @direntry -* GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools. +* GNAT Reference Manual: (gnat_rm-4.7). Reference Manual for GNU Ada tools. @end direntry @titlepage diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index 658ab98..ccbb53a 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -53,7 +53,7 @@ This manual contains no Invariant Sections. The Front-Cover Texts are @ifinfo @dircategory Software development @direntry -* Cpp: (cpp). The GNU C preprocessor. +* @value{fncpp}: (@value{fncpp}). The GNU C preprocessor. @end direntry @end ifinfo diff --git a/gcc/doc/cppinternals.texi b/gcc/doc/cppinternals.texi index a22ef0d..fbf3297 100644 --- a/gcc/doc/cppinternals.texi +++ b/gcc/doc/cppinternals.texi @@ -7,7 +7,7 @@ @ifinfo @dircategory Software development @direntry -* Cpplib: (cppinternals). Cpplib internals. +* @value{fncppint}: (@value{fncppint}). Cpplib internals. @end direntry @end ifinfo diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index 27a9e4f..68d2d7b 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -14874,7 +14874,7 @@ want to write code that checks whether these features are available, you can test for the GNU compiler the same way as for C programs: check for a predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to test specifically for GNU C++ (@pxref{Common Predefined Macros,, -Predefined Macros,cpp,The GNU C Preprocessor}). +Predefined Macros,@value{fncpp},The GNU C Preprocessor}). @menu * C++ Volatiles:: What constitutes an access to a volatile object. diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi index 0e167ba..92e39d3 100644 --- a/gcc/doc/gcc.texi +++ b/gcc/doc/gcc.texi @@ -65,8 +65,8 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b) @ifnottex @dircategory Software development @direntry -* gcc: (gcc). The GNU Compiler Collection. -* g++: (gcc). The GNU C++ compiler. +* @value{fngcc}: (@value{fngcc}). The GNU Compiler Collection. +* @value{fngxx}: (@value{fngcc}). The GNU C++ compiler. @end direntry This file documents the use of the GNU compilers. @sp 1 @@ -126,7 +126,7 @@ version @value{version-GCC}. The internals of the GNU compilers, including how to port them to new targets and some information about how to write front ends for new languages, are documented in a separate manual. @xref{Top,, -Introduction, gccint, GNU Compiler Collection (GCC) Internals}. +Introduction, @value{fngccint}, GNU Compiler Collection (GCC) Internals}. @menu * G++ and GCC:: You can compile C or C++ programs. diff --git a/gcc/doc/gccint.texi b/gcc/doc/gccint.texi index d4a8a58..f2377f8 100644 --- a/gcc/doc/gccint.texi +++ b/gcc/doc/gccint.texi @@ -51,7 +51,7 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b) @ifnottex @dircategory Software development @direntry -* gccint: (gccint). Internals of the GNU Compiler Collection. +* @value{fngccint}: (@value{fngccint}). Internals of the GNU Compiler Collection. @end direntry This file documents the internals of the GNU compilers. @sp 1 @@ -83,7 +83,7 @@ write front ends for new languages. It corresponds to the compilers @value{VERSION_PACKAGE} @end ifset version @value{version-GCC}. The use of the GNU compilers is documented in a -separate manual. @xref{Top,, Introduction, gcc, Using the GNU +separate manual. @xref{Top,, Introduction, @value{fngcc}, Using the GNU Compiler Collection (GCC)}. This manual is mainly a reference manual rather than a tutorial. It diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 598873a..2b8bbdc 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -98,7 +98,7 @@ Free Documentation License}''. @end ifinfo @dircategory Software development @direntry -* gccinstall: (gccinstall). Installing the GNU Compiler Collection. +* @value{fngccinstall}: (@value{fngccinstall}). Installing the GNU Compiler Collection. @end direntry @c Part 3 Titlepage and Copyright diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 8fcebf3..1db8138 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -9438,7 +9438,7 @@ One of the standard libraries bypassed by @option{-nostdlib} and @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines which GCC uses to overcome shortcomings of particular machines, or special needs for some languages. -(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler +(@xref{Interface,,Interfacing to GCC Output,@value{fngccint},GNU Compiler Collection (GCC) Internals}, for more discussion of @file{libgcc.a}.) In most cases, you need @file{libgcc.a} even when you want to avoid @@ -9446,7 +9446,7 @@ other standard libraries. In other words, when you specify @option{-nostdlib} or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. This ensures that you have no unresolved references to internal GCC library subroutines. (For example, @samp{__main}, used to ensure C++ -constructors will be called; @pxref{Collect2,,@code{collect2}, gccint, +constructors will be called; @pxref{Collect2,,@code{collect2}, @value{fngccint}, GNU Compiler Collection (GCC) Internals}.) @item -pie @@ -19656,7 +19656,7 @@ Note that you can also specify places to search using options such as @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}). These take precedence over places specified using environment variables, which in turn take precedence over those specified by the configuration of GCC@. -@xref{Driver,, Controlling the Compilation Driver @file{gcc}, gccint, +@xref{Driver,, Controlling the Compilation Driver @file{gcc}, @value{fngccint}, GNU Compiler Collection (GCC) Internals}. @table @env @@ -19817,7 +19817,7 @@ the headers it contains change. A precompiled header file will be searched for when @code{#include} is seen in the compilation. As it searches for the included file -(@pxref{Search Path,,Search Path,cpp,The C Preprocessor}) the +(@pxref{Search Path,,Search Path,@value{fncpp},The C Preprocessor}) the compiler looks for a precompiled header in each directory just before it looks for the include file in that directory. The name searched for is the name specified in the @code{#include} with @samp{.gch} appended. If diff --git a/gcc/doc/libgcc.texi b/gcc/doc/libgcc.texi index 9a22223..f80e508 100644 --- a/gcc/doc/libgcc.texi +++ b/gcc/doc/libgcc.texi @@ -25,7 +25,7 @@ that needs them. GCC will also generate calls to C library routines, such as @code{memcpy} and @code{memset}, in some cases. The set of routines that GCC may possibly use is documented in @ref{Other -Builtins,,,gcc, Using the GNU Compiler Collection (GCC)}. +Builtins,,,@value{fngcc}, Using the GNU Compiler Collection (GCC)}. These routines take arguments and return values of a specific machine mode, not a specific C type. @xref{Machine Modes}, for an explanation diff --git a/gcc/doc/makefile.texi b/gcc/doc/makefile.texi index 8e76fea..32724ee 100644 --- a/gcc/doc/makefile.texi +++ b/gcc/doc/makefile.texi @@ -140,7 +140,7 @@ regardless of how it itself was compiled. Builds a compiler with profiling feedback information. In this case, the second and third stages are named @samp{profile} and @samp{feedback}, respectively. For more information, see -@ref{Building,,Building with profile feedback,gccinstall,Installing GCC}. +@ref{Building,,Building with profile feedback,@value{fngccinstall},Installing GCC}. @item restrap Restart a bootstrap, so that everything that was not built with diff --git a/gcc/doc/passes.texi b/gcc/doc/passes.texi index 8329ddd..456a2f1 100644 --- a/gcc/doc/passes.texi +++ b/gcc/doc/passes.texi @@ -199,7 +199,7 @@ rid of it. This pass is located in @file{tree-cfg.c} and described by @item Mudflap declaration registration If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth --fmudflapir,gcc,Using the GNU Compiler Collection (GCC)}) is +-fmudflapir,@value{fngcc},Using the GNU Compiler Collection (GCC)}) is enabled, we generate code to register some variable declarations with the mudflap runtime. Specifically, the runtime tracks the lifetimes of those variable declarations that have their addresses taken, or whose diff --git a/gcc/doc/standards.texi b/gcc/doc/standards.texi index 0bbb5d7..17c494d 100644 --- a/gcc/doc/standards.texi +++ b/gcc/doc/standards.texi @@ -295,8 +295,8 @@ date that the release was frozen. GNAT Reference Manual}, for information on standard conformance and compatibility of the Ada compiler. -@xref{Standards,,Standards, gfortran, The GNU Fortran Compiler}, for details +@xref{Standards,,Standards, @value{fngfortran}, The GNU Fortran Compiler}, for details of standards supported by GNU Fortran. -@xref{Compatibility,,Compatibility with the Java Platform, gcj, GNU gcj}, +@xref{Compatibility,,Compatibility with the Java Platform, @value{fngcj}, GNU gcj}, for details of compatibility between @command{gcj} and the Java Platform. diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 2602b15..9e913bd 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -118,7 +118,8 @@ fortran.tags: force cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub -fortran.info: doc/gfortran.info doc/gfc-internals.info +INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)') +fortran.info: doc/$(INFO_FORTRAN_NAME).info fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi F95_HTMLFILES = $(build_htmldir)/gfortran @@ -190,10 +191,10 @@ GFORTRAN_TEXI = \ $(srcdir)/doc/include/gcc-common.texi \ gcc-vers.texi -doc/gfortran.info: $(GFORTRAN_TEXI) +doc/$(INFO_FORTRAN_NAME).info: $(GFORTRAN_TEXI) if [ x$(BUILD_INFO) = xinfo ]; then \ rm -f doc/gfortran.info-*; \ - $(MAKEINFO) -I $(srcdir)/doc/include -I $(srcdir)/fortran \ + $(MAKEINFO) $(MAKEINFODEFS) -I $(srcdir)/doc/include -I $(srcdir)/fortran \ -o $@ $<; \ else true; fi @@ -261,7 +262,7 @@ fortran.install-common: install-finclude-dir installdirs fortran.install-plugin: -fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info +fortran.install-info: $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext) @@ -279,7 +280,7 @@ fortran.uninstall: rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ - rm -rf $(DESTDIR)$(infodir)/gfortran.info* + rm -rf $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info* # # Clean hooks: diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi index b1790c6..7cb7a3d 100644 --- a/gcc/fortran/gfortran.texi +++ b/gcc/fortran/gfortran.texi @@ -101,7 +101,7 @@ Texts being (a) (see below), and with the Back-Cover Texts being (b) @ifinfo @dircategory Software development @direntry -* gfortran: (gfortran). The GNU Fortran Compiler. +* @value{fngfortran}: (@value{fngfortran}). The GNU Fortran Compiler. @end direntry This file documents the use and the internals of the GNU Fortran compiler, (@command{gfortran}). diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 4d6b63b..4319af5 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -127,11 +127,23 @@ java.tags: force etags --include TAGS.sub --include ../TAGS.sub -java.info: doc/gcj.info +TEXI_GCJ_FILES = java/gcj.texi \ + $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/funding.texi \ + $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi +INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)') -java.srcinfo: doc/gcj.info +java.info: doc/$(INFO_GCJ_NAME).info + +java.srcinfo: doc/$(INFO_GCJ_NAME).info -cp -p $^ $(srcdir)/doc +doc/$(INFO_GCJ_NAME).info: $(TEXI_GCJ_FILES) + if test "x$(BUILD_INFO)" = xinfo; then \ + rm -f $(@)*; \ + $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) \ + -I$(gcc_docdir)/include -I$(srcdir)/f -o$@ $<; \ + fi + java.dvi: doc/gcj.dvi JAVA_PDFFILES = doc/gcj.pdf @@ -194,8 +206,9 @@ java.uninstall: -rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext) + -rm -f $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info* -java.install-info: $(DESTDIR)$(infodir)/gcj.info +java.install-info: $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info java.install-pdf: $(JAVA_PDFFILES) @$(NORMAL_INSTALL) diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index 01acf43..8902650 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -55,21 +55,21 @@ man page gfdl(7). @format @dircategory Software development @direntry -* Gcj: (gcj). Ahead-of-time compiler for the Java language +* @value{fngcj}: (@value{fngcj}). Ahead-of-time compiler for the Java language @end direntry @dircategory Individual utilities @direntry -* jcf-dump: (gcj)Invoking jcf-dump. +* jcf-dump: (@value{fngcj}) Invoking jcf-dump. Print information about Java class files -* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode -* gcj-dbtool: (gcj)Invoking gcj-dbtool. +* gij: (@value{fngcj}) Invoking gij. GNU interpreter for Java bytecode +* gcj-dbtool: (@value{fngcj}) Invoking gcj-dbtool. Tool for manipulating class file databases. -* jv-convert: (gcj)Invoking jv-convert. +* jv-convert: (@value{fngcj}) Invoking jv-convert. Convert file from one encoding to another -* grmic: (gcj)Invoking grmic. +* grmic: (@value{fngcj}) Invoking grmic. Generate stubs for Remote Method Invocation. -* gc-analyze: (gcj)Invoking gc-analyze. +* gc-analyze: (@value{fngcj}) Invoking gc-analyze. Analyze Garbage Collector (GC) memory dumps. * aot-compile: (gcj)Invoking aot-compile. Compile bytecode to native and generate databases. @@ -159,7 +159,7 @@ and the Info entries for @file{gcj} and @file{gcc}. As @command{gcj} is just another front end to @command{gcc}, it supports many of the same options as gcc. @xref{Option Summary, , Option Summary, -gcc, Using the GNU Compiler Collection (GCC)}. This manual only documents the +@value{fngcc}, Using the GNU Compiler Collection (GCC)}. This manual only documents the options specific to @command{gcj}. @c man end diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 2bc4986..3602b6c 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -111,16 +111,19 @@ endif all-local: $(STAMP_GENINSRC) -stamp-geninsrc: libgomp.info - cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info +INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)') +stamp-geninsrc: $(INFO_LIBGOMP_NAME).info + cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info @touch $@ -libgomp.info: $(STAMP_BUILD_INFO) +libgomp.info: $(INFO_LIBGOMP_NAME).info + cp $(INFO_LIBGOMP_NAME).info libgomp.info +$(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO) stamp-build-info: libgomp.texi - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi @touch $@ -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info MAINTAINERCLEANFILES = $(srcdir)/libgomp.info diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index ecc010e..a90f727 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -345,7 +345,8 @@ info_TEXINFOS = libgomp.texi # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info -CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info +INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)') +CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info MAINTAINERCLEANFILES = $(srcdir)/libgomp.info all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1092,15 +1093,16 @@ env.lo: libgomp_f.h env.o: libgomp_f.h all-local: $(STAMP_GENINSRC) - -stamp-geninsrc: libgomp.info - cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info +stamp-geninsrc: $(INFO_LIBGOMP_NAME).info + cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info @touch $@ -libgomp.info: $(STAMP_BUILD_INFO) +libgomp.info: $(INFO_LIBGOMP_NAME).info + cp $(INFO_LIBGOMP_NAME).info libgomp.info +$(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO) stamp-build-info: libgomp.texi - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi @touch $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi index 29c078b..5b55db2 100644 --- a/libgomp/libgomp.texi +++ b/libgomp/libgomp.texi @@ -31,7 +31,7 @@ texts being (a) (see below), and with the Back-Cover Texts being (b) @ifinfo @dircategory GNU Libraries @direntry -* libgomp: (libgomp). GNU OpenMP runtime library +* @value{fnlibgomp}: (@value{fnlibgomp}). GNU OpenMP runtime library @end direntry This manual documents the GNU implementation of the OpenMP API for -- 2.7.4