[folks] Disable build gtk-docs, since valadoc crashes on them.
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Disable build gtk-docs, since valadoc crashes on them.
- Date: Wed, 23 Feb 2011 21:08:59 +0000 (UTC)
commit bdcbcdf3f2c9b9453dd10dc9bf7a2985eec289f9
Author: Travis Reitter <travis reitter collabora co uk>
Date: Wed Feb 23 12:45:58 2011 -0800
Disable build gtk-docs, since valadoc crashes on them.
This is related to, but not exactly, bgo#629531.
docs/Makefile.am | 55 +++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
---
diff --git a/docs/Makefile.am b/docs/Makefile.am
index bc04eba..1808abc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,9 +1,11 @@
folksdocdir=$(datadir)/devhelp/references/folks
folksimgdir=$(datadir)/devhelp/references/folks/img
-folksgtkdocdir=$(datadir)/gtk-doc/html/folks
folkstelepathydocdir=$(datadir)/devhelp/references/folks-telepathy
folkstelepathyimgdir=$(datadir)/devhelp/references/folks-telepathy/img
-folkstelepathygtkdocdir=$(datadir)/gtk-doc/html/folks-telepathy
+
+# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
+#folksgtkdocdir=$(datadir)/gtk-doc/html/folks
+#folkstelepathygtkdocdir=$(datadir)/gtk-doc/html/folks-telepathy
common_doc_files = \
*.css \
@@ -17,12 +19,14 @@ folksdoc_DATA = \
folks/folks/folks.devhelp2 \
$(addprefix folks/folks/,$(common_doc_files)) \
$(NULL)
-folksgtkdoc_DATA = gtk-doc/folks/html/*
folkstelepathydoc_DATA = \
folks-telepathy/folks-telepathy/folks-telepathy.devhelp2 \
$(addprefix folks-telepathy/folks-telepathy/,$(common_doc_files)) \
$(NULL)
-folkstelepathygtkdoc_DATA = gtk-doc/folks-telepathy/html/*
+
+# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
+#folksgtkdoc_DATA = gtk-doc/folks/html/*
+#folkstelepathygtkdoc_DATA = gtk-doc/folks-telepathy/html/*
folksimg_DATA = \
folks/folks/img/*.png \
@@ -32,9 +36,10 @@ folkstelepathyimg_DATA = \
$(NULL)
$(folksdoc_DATA) $(folksimg_DATA): folks-doc
-$(folksgtkdoc_DATA): folks-gtk-doc
$(folkstelepathydoc_DATA) $(folkstelepathyimg_DATA): folks-telepathy-doc
-$(folkstelepathygtkdoc_DATA): folks-telepathy-gtk-doc
+# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
+#$(folksgtkdoc_DATA): folks-gtk-doc
+#$(folkstelepathygtkdoc_DATA): folks-telepathy-gtk-doc
valadoc_flags = \
--force \
@@ -64,13 +69,14 @@ folks-doc: $(folks_doc_files)
$(valadoc_flags_folks) \
$(NULL)
-folks-gtk-doc: $(folks_doc_files)
- $(AM_V_GEN)$(VALADOC) \
- -X -l -X $(top_builddir)/folks/.libs/libfolks.so \
- -o gtk-doc/folks \
- --doclet=gtkdoc \
- $(valadoc_flags_folks) \
- $(NULL)
+# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
+#folks-gtk-doc: $(folks_doc_files)
+# $(AM_V_GEN)$(VALADOC) \
+# -X -l -X $(top_builddir)/folks/.libs/libfolks.so \
+# -o gtk-doc/folks \
+# --doclet=gtkdoc \
+# $(valadoc_flags_folks) \
+# $(NULL)
# folks-telepathy documentation
folks_telepathy_doc_files = $(top_srcdir)/backends/telepathy/lib/*.vala
@@ -100,17 +106,20 @@ folks-telepathy-doc: $(folks_telepathy_doc_files)
$(valadoc_flags_folks_telepathy) \
$(NULL)
-folks-telepathy-gtk-doc: $(folks_telepathy_doc_files)
- $(AM_V_GEN)$(VALADOC) \
- -X -l -X $(top_builddir)/folks/.libs/libfolks.so \
- -X -l -X $(top_builddir)/backends/telepathy/lib/.libs/libfolks-telepathy.so \
- -X --ignore-headers -X $(top_srcdir)/backends/telepathy/lib/tp-lowlevel.h \
- -o gtk-doc/folks-telepathy \
- --doclet=gtkdoc \
- $(valadoc_flags_folks_telepathy) \
- $(NULL)
+# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
+#folks-telepathy-gtk-doc: $(folks_telepathy_doc_files)
+# $(AM_V_GEN)$(VALADOC) \
+# -X -l -X $(top_builddir)/folks/.libs/libfolks.so \
+# -X -l -X $(top_builddir)/backends/telepathy/lib/.libs/libfolks-telepathy.so \
+# -X --ignore-headers -X $(top_srcdir)/backends/telepathy/lib/tp-lowlevel.h \
+# -o gtk-doc/folks-telepathy \
+# --doclet=gtkdoc \
+# $(valadoc_flags_folks_telepathy) \
+# $(NULL)
-.PHONY: folks-doc folks-gtk-doc folks-telepathy-doc folks-telepathy-gtk-doc
+# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
+#.PHONY: folks-doc folks-gtk-doc folks-telepathy-doc folks-telepathy-gtk-doc
+.PHONY: folks-doc folks-telepathy-doc
distclean-local: distclean-docs
distclean-docs:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]