blob: fb58d3d0742eb921eb498a04bf0717fa365e489d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From e8d24752672c3359e27dca05686ac96226fd00bf Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 28 Aug 2017 15:03:08 +0200
Subject: [PATCH] Fix building documentation with new gtk-doc
New gtk-doc 2.16 for some reason automatically creates a no-op
"$(DOC_MAIN_SGML_FILE)" make target that overrides our target
for creating "udisks2-docs.xml", "udisks2.types" and
"udisks2-sections.txt" files.
---
doc/Makefile.am | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dff59e9c..8f7b77e8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -73,10 +73,14 @@ extra_files = \
# ------------------------------------------------------------------------------
-all-local: $(DOC_MAIN_SGML_FILE)
+all-local: generate-main-sgml-file
+
+# New gtk-doc 2.16 for some reason automatically creates a no-op
+# "$(DOC_MAIN_SGML_FILE)" make target that overrides our target
+$(DOC_MAIN_SGML_FILE): generate-main-sgml-file
# udisks2-docs.xml, udisks2-sections.txt udisks2.types
-$(DOC_MAIN_SGML_FILE): $(DOC_MAIN_SGML_FILE).in $(UDISKS_SECTIONS).in $(UDISKS_TYPES).in
+generate-main-sgml-file: $(DOC_MAIN_SGML_FILE).in $(UDISKS_SECTIONS).in $(UDISKS_TYPES).in
$(AM_V_at) rm -f $(DOC_MAIN_SGML_FILE) $(UDISKS_SECTIONS) $(UDISKS_TYPES) && \
cp $(DOC_MAIN_SGML_FILE).in $(builddir)/$(DOC_MAIN_SGML_FILE) && \
cp $(UDISKS_SECTIONS).in $(builddir)/$(UDISKS_SECTIONS) && \
@@ -261,3 +265,5 @@ CLEANFILES += \
*.stamp \
-rf xml html tmpl \
$(NULL)
+
+.PHONY: generate-main-sgml-file
|