From d47446bedf4ef52c6a8366a9504045c077af3212 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 2 Apr 2019 16:10:01 +0100 Subject: [PATCH] Build *.1 man pages with xsltproc even if gtk-doc is disabled These go in libcapsule-tools, not libcapsule-doc, so we can't skip them in architecture-only Debian builds. Signed-off-by: Simon McVittie <smcv@collabora.com> --- configure.ac | 1 + documentation.mk | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e0d090e77..f06463239 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,7 @@ AM_CONDITIONAL([ENABLE_TOOLS_RPATH], [test "x$enable_tools_rpath" != x]) AC_SEARCH_LIBS([dlmopen], [dl]) AC_PATH_PROG([XSLTPROC], [xsltproc]) +AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != x]) GTK_DOC_CHECK AC_CONFIG_FILES([Makefile data/libcapsule.pc data/libcapsule-uninstalled.pc data/libcapsule-tools.pc data/libcapsule-tools-uninstalled.pc data/dirconf.txt]) AC_OUTPUT diff --git a/documentation.mk b/documentation.mk index 364a6f0d7..d9b784f0c 100644 --- a/documentation.mk +++ b/documentation.mk @@ -31,11 +31,17 @@ XSLT_MAN = http://$(XSLT_DOMAIN)/release/xsl/current/manpages/docbook.xsl XSLT_CAPARGS = --stringparam fsinfo "$$(printf "\#define _GNU_SOURCE\012\#include <capsule/capsule.h>")" --stringparam target XSLTPROC_STD = $(XSLTPROC) $(XSLTPROC_FLAGS) -if ENABLE_GTK_DOC +man_MANS = +if HAVE_XSLTPROC %.1: doc/%.xml $(AM_V_GEN) $(XSLTPROC_STD) $(XSLT_MAN) $< +man_MANS += capsule-init-project.1 capsule-mkstublib.1 +endif # HAVE_XSLTPROC + +if ENABLE_GTK_DOC + xml/capsule.xml: docs %.3.xml: xml/capsule.xml doc/devhelp2man.xslt documentation.mk @@ -44,11 +50,10 @@ xml/capsule.xml: docs %.3: %.3.xml documentation.mk $(AM_V_GEN) $(XSLTPROC_STD) $(XSLT_MAN) $< -man_MANS = capsule-init-project.1 capsule-mkstublib.1 man_MANS += capsule_init.3 man_MANS += capsule_shim_dlopen.3 man_MANS += capsule_external_dlsym.3 -CLEANFILES += $(man_MANS) - endif # ENABLE_GTK_DOC + +CLEANFILES += $(man_MANS) -- GitLab