From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id D4D003898021; Thu, 24 Jun 2021 15:11:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4D003898021 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)] libiberty: integrate info to sphinx-build X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/sphinx-v2 X-Git-Oldrev: f7e2d57d7156a58cc5b486ec5324dac3c8d6ed76 X-Git-Newrev: 2a2ac6fa1f1b0fabe8b98d982c2bc5261a41c33c Message-Id: <20210624151125.D4D003898021@sourceware.org> Date: Thu, 24 Jun 2021 15:11:25 +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 15:11:25 -0000 https://gcc.gnu.org/g:2a2ac6fa1f1b0fabe8b98d982c2bc5261a41c33c commit 2a2ac6fa1f1b0fabe8b98d982c2bc5261a41c33c Author: Martin Liska Date: Thu Jun 24 16:43:55 2021 +0200 libiberty: integrate info to sphinx-build Diff: --- doc/baseconf.py | 2 +- libiberty/Makefile.in | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/baseconf.py b/doc/baseconf.py index 206328d43e5..c50dcc57299 100644 --- a/doc/baseconf.py +++ b/doc/baseconf.py @@ -36,7 +36,7 @@ gcc_REVISION = __read_file('REVISION') VERSION_PACKAGE = os.getenv('VERSION_PACKAGE') BUGURL = os.getenv('BUGURL') -assert VERSION_PACKAGE and BUGURL +assert VERSION_PACKAGE is not None and BUGURL is not None # The short X.Y version. version = gcc_BASEVER diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 4f1213b983b..f38a5885048 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -273,7 +273,7 @@ $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) -info: libiberty.info info-subdir +info: doc/texinfo/libiberty.info info-subdir install-info: install-info-subdir clean-info: clean-info-subdir dvi: libiberty.dvi dvi-subdir @@ -338,6 +338,16 @@ TEXISRC = \ # elsewhere. Others represent headers in ../include. TEXIFILES = fnmatch.txh pexecute.txh simple-object.txh +export VERSION_PACKAGE= +export BUGURL= + +RST_FILES:=$(shell find $(srcdir) -name *.rst) +SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py +SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES) + +doc/texinfo/libiberty.info: $(SPHINX_CONFIG_FILES) + + make -C $(srcdir)/../doc info SOURCEDIR=$(srcdir)/doc BUILDDIR=doc/info + libiberty.info : $(srcdir)/libiberty.texi $(TEXISRC) $(MAKEINFO) -I$(srcdir) $(srcdir)/libiberty.texi