public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/sphinx-v2)] Restore srcinfo and srcman.
@ 2021-06-24 14:06 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2021-06-24 14:06 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:acc784072aa16b4d17ea5d9d659397dae17afb71
commit acc784072aa16b4d17ea5d9d659397dae17afb71
Author: Martin Liska <mliska@suse.cz>
Date: Thu Jun 24 16:04:52 2021 +0200
Restore srcinfo and srcman.
Diff:
---
gcc/Makefile.in | 30 +++++++++++++++++++++---------
gcc/fortran/Make-lang.in | 7 ++++++-
2 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 4158f0016f9..da44f28ac92 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3263,6 +3263,17 @@ install-no-fixedincludes:
doc: $(SPHINX_BUILD)
+INFOFILES = doc/gcc/info/texinfo/gcc.info \
+ doc/gccint/info/texinfo/gccint.info \
+ doc/cpp/info/texinfo/cpp.info \
+ doc/cppinternals/info/texinfo/cppinternals.info \
+ doc/install/info/texinfo/install.info
+
+info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
+
+srcinfo: $(INFOFILES)
+ -cp -p $^ $(srcdir)/doc
+
TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi \
gcc-common.texi gcc-vers.texi
@@ -3372,20 +3383,20 @@ $(build_htmldir)/gccinstall/index.html: $(TEXI_GCCINSTALL_FILES)
DESTDIR=$(@D) \
$(SHELL) $(srcdir)/doc/install.texi2html
- $(if $(filter yes,@enable_lto@),doc/lto-dump.1)
+MANFILES = doc/gcc/man/man/gcc.1 doc/cpp/man/man/cpp.1 \
+ doc/gcc/man/man/gfdl.7 doc/gcc/man/man/gpl.7 \
+ doc/gcc/man/man/fsf-funding.7 doc/gcc/man/man/gcov-tool.1 \
+ doc/gcc/man/man/gcov.1 doc/gcc/man/man/gcov-dump.1 \
+ $(if $(filter yes,@enable_lto@),doc/gcc/man/man/lto-dump.1)
export VERSION_PACKAGE="$(PKGVERSION)"
export ENABLE_LTO=$(enable_lto)
export BUGURL="$(BUGURL_s)"
-man: doc/gcc/man/man/gcc.1 doc/cpp/man/man/cpp.1 lang.man @GENINSRC@
+man: $(MANFILES) lang.man @GENINSRC@ srcman lang.srcman
-info: doc/gcc/info/texinfo/gcc.info \
- doc/gccint/info/texinfo/gccint.info \
- doc/cpp/info/texinfo/cpp.info \
- doc/cppinternals/info/texinfo/cppinternals.info \
- doc/install/info/texinfo/install.info \
- lang.info @GENINSRC@
+srcman: $(MANFILES)
+ -cp -p $^ $(srcdir)/doc
sphinx-build: man info
@@ -3396,6 +3407,8 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
doc/gcc/man/man/gcc.1: $(SPHINX_FILES)
+ make -C $(srcdir)/../doc man SOURCEDIR=$(srcdir)/doc/gcc BUILDDIR=$(objdir)/doc/gcc/man
+doc/gcc/man/man/gcov.1: doc/gcc/man/man/gcc.1
+
doc/cpp/man/man/cpp.1: $(SPHINX_FILES)
+ make -C $(srcdir)/../doc man SOURCEDIR=$(srcdir)/doc/cpp BUILDDIR=$(objdir)/doc/cpp/man
@@ -3847,7 +3860,6 @@ $(DESTDIR)$(man7dir)/gpl$(man7ext): doc/gcc/man/man/gpl.7 installdirs
-$(INSTALL_DATA) $< $@
-chmod a-x $@
-
# Install all the header files built in the include subdirectory.
install-headers: $(INSTALL_HEADERS_DIR)
# Fix symlinks to absolute paths in the installed include directory to
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 18dd5d2089a..66e350c2c39 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -109,6 +109,9 @@ fortran.all.cross: gfortran-cross$(exeext)
fortran.start.encap: gfortran$(exeext)
fortran.rest.encap:
+fortran.srcinfo: doc/fortran/info/texinfo/gfortran.info
+ -cp -p $^ $(srcdir)/fortran
+
fortran.tags: force
cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \
etags --include TAGS.sub --include ../TAGS.sub
@@ -156,10 +159,12 @@ fortran.install-pdf: $(F95_PDFFILES)
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/gcc/$$f"; \
done
+F95_MANFILES = doc/fortran/man/man/gfortran.1
+
doc/fortran/man/man/gfortran.1: $(SPHINX_FILES)
+ make -C $(srcdir)/../doc man SOURCEDIR=$(srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/man
-fortran.man: doc/fortran/man/man/gfortran.1
+fortran.man: $(F95_MANFILES)
fortran.srcman: $(F95_MANFILES)
-cp -p $^ $(srcdir)/doc
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-24 14:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-24 14:06 [gcc(refs/users/marxin/heads/sphinx-v2)] Restore srcinfo and srcman Martin Liska
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).