From 3c4006e9059af086917c58a94f2f69cedd116bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vivek=20Das=C2=A0Mohapatra?= <vivek@collabora.co.uk> Date: Fri, 21 Jul 2017 15:57:00 +0100 Subject: [PATCH] Move gtk-doc config into Makefile.am It must live in a configure-generated file, not in the static documentation.mk --- Makefile.am | 29 +++++++++++++++++++++++++++-- documentation.mk | 22 ---------------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5ac128337..a0be556d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,5 +88,30 @@ dist_pkgdata_DATA = data/capsule-shim.h \ CLEANFILES = $(shim_files) $(shim_srcs) BUILT_SOURCES = $(shim_srcs) -include documentation.mk -include disabled.mk +include $(top_srcdir)/disabled.mk + +# ============================================================================ +# standalone man pages +include $(top_srcdir)/documentation.mk + +# ============================================================================ +# gtk-doc configuration: see /usr/share/doc/gtk-doc-tools/examples/Makefile.am +DOC_MODULE = libcapsule +DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml +DOC_SOURCE_DIR = capsule +SCAN_OPTIONS = +MKDB_OPTIONS = --xml-mode --output-format=xml +MKTMPL_OPTIONS = +MKHTML_OPTIONS = +FIXXREF_OPTIONS = +HFILE_GLOB = +CFILE_GLOB = +EXTRA_HFILES = +IGNORE_HFILES = +HTML_IMAGES = +content_files = +expand_content_files = +GTKDOC_CFLAGS = +GTKDOC_LIBS = + +include $(top_srcdir)/gtk-doc.make diff --git a/documentation.mk b/documentation.mk index b093a27b9..3bfc6f225 100644 --- a/documentation.mk +++ b/documentation.mk @@ -15,28 +15,6 @@ XSLT_MAN = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.x %.3: xml/%.xml docs $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) $(XSLT_MAN) $< -# ============================================================================ -# gtk-doc configuration: see /usr/share/doc/gtk-doc-tools/examples/Makefile.am -DOC_MODULE = libcapsule -DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml -DOC_SOURCE_DIR = capsule -SCAN_OPTIONS = -MKDB_OPTIONS = --xml-mode --output-format=xml -MKTMPL_OPTIONS = -MKHTML_OPTIONS = -FIXXREF_OPTIONS = -HFILE_GLOB = -CFILE_GLOB = -EXTRA_HFILES = -IGNORE_HFILES = -HTML_IMAGES = -content_files = -expand_content_files = -GTKDOC_CFLAGS = -GTKDOC_LIBS = - --include gtk-doc.make -# ============================================================================ man_MANS = capsule-init-project.1 capsule-mkstublib.1 CLEANFILES += $(man_MANS) -- GitLab