[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: DOC: Conditionally build doxygen; build
From: |
gnunet |
Subject: |
[gnunet] branch master updated: DOC: Conditionally build doxygen; build sphinx on bootstrap |
Date: |
Sun, 25 Sep 2022 14:35:39 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 82a7bd8af DOC: Conditionally build doxygen; build sphinx on bootstrap
82a7bd8af is described below
commit 82a7bd8af34060d352348241e139dbcd775311f5
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Sep 25 21:35:32 2022 +0900
DOC: Conditionally build doxygen; build sphinx on bootstrap
---
bootstrap | 2 +-
configure.ac | 19 +++++++------------
doc/Makefile.am | 14 ++++++++------
3 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/bootstrap b/bootstrap
index cee9a1ff7..3fa6e67ad 100755
--- a/bootstrap
+++ b/bootstrap
@@ -90,7 +90,7 @@ check_libtool()
sphinx ()
{
# Bootstrap Sphinx documentation
- cd doc/sphinx; make man info ; cd -
+ cd doc/sphinx; make man info html >/dev/null; cd -
}
diff --git a/configure.ac b/configure.ac
index f24ca77b2..bfaff3280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,15 +442,10 @@ AC_ARG_ENABLE([documentation],
[documentation=${enableval}],
[documentation=yes])
-AC_CHECK_PROG([SPHINX_BINARY], [sphinx-build], [true], [false])
-AM_CONDITIONAL([HAVE_SPHINX_BINARY], [$SPHINX_BINARY])
+AC_CHECK_PROG([DOXY_BINARY], [doxygen], [true], [false])
+AM_CONDITIONAL([HAVE_DOXY_BINARY], [$DOXY_BINARY])
AM_CONDITIONAL([DOCUMENTATION], [test "x$documentation" = "xyes"])
-AS_IF([test "x$documentation" = "xyes"],
- [AS_IF([$SPHINX_BINARY],
- [AC_DEFINE([DOCUMENTATION], [1], [Define to 1 if documentation is
built])],
- [AC_MSG_ERROR([Documentation requires sphinx])])],
- [AC_DEFINE([DOCUMENTATION], [0], [Define to 1 if documentation is
built])])
AC_CHECK_PROGS([MANDOC_BINARY], [mandoc], [false])
AM_CONDITIONAL([HAVE_MANDOC], [test "x$MANDOC_BINARY" != "xfalse"])
@@ -1458,10 +1453,10 @@ AS_IF([test "x$MANDOC_BINARY" = "xfalse"],
[mandoc_msg="no"],
[mandoc_msg="yes"])
-# sphinx
-AS_IF([test "x$documentation" = "xyes"],
- [sphinx_msg="yes"],
- [sphinx_msg="no"])
+# doxy
+AS_IF([$DOXY_BINARY],
+ [doxy_msg="yes"],
+ [doxy_msg="no"])
# conversation
conversation_msg="no"
@@ -1605,7 +1600,7 @@ gstreamer: ${gstreamer_msg}
Java: ${java_msg}
-sphinx: ${sphinx_msg}
+doxygen: ${doxy_msg}
mandoc: ${mandoc_msg}
GNUnet configuration
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4194447fc..cfcb55453 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,14 +2,16 @@
SUBDIRS = .
-if DOCUMENTATION
+if HAVE_DOXY_BINARY
SUBDIRS += doxygen
-all-local:
- cd sphinx && make html
+endif
+
+sphinx: Makefile
+ cd sphinx && make html man info
+
install-data-hook:
mkdir -p $(DESTDIR)$(docdir)
cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
-endif
if INCLUDE_MANPAGES
man_MANS = sphinx/_build/man/gnunet.1
@@ -20,8 +22,8 @@ info_TEXINFOS = \
sphinx/_build/texinfo/gnunet.texi
EXTRA_DIST = \
- $(man_MANS) \
- $(info_TEXINFOS) \
+ $(man_MANS) \
+ $(info_TEXINFOS) \
system_specific/outdated-and-old-installation-instructions.txt \
system_specific/FROM_SOURCE \
sphinx/about.rst \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: DOC: Conditionally build doxygen; build sphinx on bootstrap,
gnunet <=