public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/sphinx-v2)] Use proper Makefile file-based dependencies.
@ 2021-06-24 12:22 Martin Liska
0 siblings, 0 replies; 2+ messages in thread
From: Martin Liska @ 2021-06-24 12:22 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:7c75b62f9be10b974ed04b752d1524020c58b356
commit 7c75b62f9be10b974ed04b752d1524020c58b356
Author: Martin Liska <mliska@suse.cz>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gcc(refs/users/marxin/heads/sphinx-v2)] Use proper Makefile file-based dependencies.
@ 2021-06-24 14:06 Martin Liska
0 siblings, 0 replies; 2+ messages in thread
From: Martin Liska @ 2021-06-24 14:06 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:29d99ae6b1837590a360cc695484d54718f7f052
commit 29d99ae6b1837590a360cc695484d54718f7f052
Author: Martin Liska <mliska@suse.cz>
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 12c38ed25ca..4158f0016f9 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3378,33 +3378,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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-24 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-24 12:22 [gcc(refs/users/marxin/heads/sphinx-v2)] Use proper Makefile file-based dependencies Martin Liska
2021-06-24 14:06 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).