From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id D98F43AAA080; Thu, 24 Jun 2021 12:22:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D98F43AAA080 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/sphinx-v2)] Use proper Makefile file-based dependencies. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/sphinx-v2 X-Git-Oldrev: cf254fe33fd0b3b50d3776b71eb05e5c36ac6ec4 X-Git-Newrev: 7c75b62f9be10b974ed04b752d1524020c58b356 Message-Id: <20210624122221.D98F43AAA080@sourceware.org> Date: Thu, 24 Jun 2021 12:22:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 12:22:22 -0000 https://gcc.gnu.org/g:7c75b62f9be10b974ed04b752d1524020c58b356 commit 7c75b62f9be10b974ed04b752d1524020c58b356 Author: Martin Liska Date: Thu Jun 24 14:22:03 2021 +0200 Use proper Makefile file-based dependencies. Diff: --- gcc/Makefile.in | 27 +++++++++++++++++---------- gcc/fortran/Make-lang.in | 10 +++++----- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 66d99c1e9f9..214a4d56d65 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3377,33 +3377,40 @@ export VERSION_PACKAGE="$(PKGVERSION)" export ENABLE_LTO=$(enable_lto) export BUGURL="$(BUGURL_s)" -man: man-gcc man-cpp lang.man @GENINSRC@ +man: doc/gcc/man/man/gcc.1 doc/cpp/man/man/cpp.1 lang.man @GENINSRC@ -info: info-gcc info-gccint info-cpp info-cppinternals info-install lang.info @GENINSRC@ +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@ sphinx-build: man info -man-gcc: doc/gcc/man/man/gcc.1 +RST_FILES:=$(shell find $(srcdir) -name *.rst -or -name *.rst.in) +SPHINX_CONFIG_FILES:=$(shell find $(srcdir)/.. -name conf.py) $(srcdir)/../doc/baseconf.py +SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES) -doc/gcc/man/man/gcc.1: +doc/gcc/man/man/gcc.1: $(SPHINX_FILES) + make -C $(srcdir)/../doc man SOURCEDIR=$(srcdir)/doc/gcc BUILDDIR=$(objdir)/doc/gcc/man -man-cpp: +doc/cpp/man/man/cpp.1: $(SPHINX_FILES) + make -C $(srcdir)/../doc man SOURCEDIR=$(srcdir)/doc/cpp BUILDDIR=$(objdir)/doc/cpp/man -info-gcc: +doc/gcc/info/texinfo/gcc.info: $(SPHINX_FILES) + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc/gcc BUILDDIR=$(objdir)/doc/gcc/info -info-gccint: s-tm-rst-in +doc/gccint/info/texinfo/gccint.info: $(SPHINX_FILES) + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc/gccint BUILDDIR=$(objdir)/doc/gccint/info -info-cpp: +doc/cpp/info/texinfo/cpp.info: $(SPHINX_FILES) + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc/cpp BUILDDIR=$(objdir)/doc/cpp/info -info-cppinternals: +doc/cppinternals/info/texinfo/cppinternals.info: $(SPHINX_FILES) + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/info -info-install: +doc/install/info/texinfo/install.info: $(SPHINX_FILES) + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc/install BUILDDIR=$(objdir)/doc/install/info html-gccint: s-tm-rst-in diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 686788ee868..18dd5d2089a 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -113,10 +113,10 @@ fortran.tags: force cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub -fortran.info: info-gfortran info-gfc-internals +fortran.info: doc/fortran/info/texinfo/gfortran.info doc/gfc-internals/info/texinfo/gfc-internals.info fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi -info-gfortran: +doc/fortran/info/texinfo/gfortran.info: $(SPHINX_FILES) + if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \ make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/info; \ else true; fi @@ -156,10 +156,10 @@ fortran.install-pdf: $(F95_PDFFILES) $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/gcc/$$f"; \ done -man-fortran: +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: man-fortran +fortran.man: doc/fortran/man/man/gfortran.1 fortran.srcman: $(F95_MANFILES) -cp -p $^ $(srcdir)/doc @@ -213,7 +213,7 @@ GFC_INTERNALS_TEXI = \ $(srcdir)/doc/include/gcc-common.texi \ gcc-vers.texi -info-gfc-internals: +doc/gfc-internals/info/texinfo/gfc-internals.info: $(SPHINX_FILES) + if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \ make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/info; \ else true; fi