[folks] Re-enable gtk-docs, now that valadoc is fixed.
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Re-enable gtk-docs, now that valadoc is fixed.
- Date: Fri, 25 Feb 2011 16:34:12 +0000 (UTC)
commit df8bd6838118bc4e5c8b063c3a1d9c2d1b24cb50
Author: Travis Reitter <travis reitter collabora co uk>
Date: Thu Feb 24 12:54:01 2011 -0800
Re-enable gtk-docs, now that valadoc is fixed.
Helps bgo#643247 - Folks needs C API documentation
configure.ac | 4 ++-
docs/Makefile.am | 55 +++++++++++++++++++++++------------------------------
2 files changed, 27 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b1d9e55..8ddc754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ AC_SUBST([FOLKS_MAJOR_MINOR_VERSION])
GLIB_REQUIRED=2.24.0
TP_GLIB_REQUIRED=0.13.1
VALA_REQUIRED=0.11.6
+VALADOC_REQUIRED=0.2.1
PKG_CHECK_MODULES([GLIB],
[glib-2.0 >= $GLIB_REQUIRED
@@ -241,7 +242,8 @@ AC_ARG_ENABLE([docs],
AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xyes])
AS_IF([test "x$enable_docs" != xno],
- [AC_PATH_PROG([VALADOC], [valadoc], [:])
+ [PKG_CHECK_MODULES([VALADOC_PC], [valadoc-1.0 >= $VALADOC_REQUIRED])
+ AC_PATH_PROG([VALADOC], [valadoc], [:])
AS_IF([test "$VALADOC" != :],
have_valadoc=yes)])
AM_CONDITIONAL([HAVE_VALADOC], [test x$have_valadoc = xyes])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1808abc..721f776 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -3,9 +3,8 @@ folksimgdir=$(datadir)/devhelp/references/folks/img
folkstelepathydocdir=$(datadir)/devhelp/references/folks-telepathy
folkstelepathyimgdir=$(datadir)/devhelp/references/folks-telepathy/img
-# 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
+folksgtkdocdir=$(datadir)/gtk-doc/html/folks
+folkstelepathygtkdocdir=$(datadir)/gtk-doc/html/folks-telepathy
common_doc_files = \
*.css \
@@ -24,9 +23,8 @@ folkstelepathydoc_DATA = \
$(addprefix folks-telepathy/folks-telepathy/,$(common_doc_files)) \
$(NULL)
-# 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/*
+folksgtkdoc_DATA = gtk-doc/folks/html/*
+folkstelepathygtkdoc_DATA = gtk-doc/folks-telepathy/html/*
folksimg_DATA = \
folks/folks/img/*.png \
@@ -37,9 +35,8 @@ folkstelepathyimg_DATA = \
$(folksdoc_DATA) $(folksimg_DATA): folks-doc
$(folkstelepathydoc_DATA) $(folkstelepathyimg_DATA): folks-telepathy-doc
-# FIXME: disabled due to continued brokenness in valadoc (related to bgo#629531)
-#$(folksgtkdoc_DATA): folks-gtk-doc
-#$(folkstelepathygtkdoc_DATA): folks-telepathy-gtk-doc
+$(folksgtkdoc_DATA): folks-gtk-doc
+$(folkstelepathygtkdoc_DATA): folks-telepathy-gtk-doc
valadoc_flags = \
--force \
@@ -69,14 +66,13 @@ folks-doc: $(folks_doc_files)
$(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-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
@@ -106,20 +102,17 @@ folks-telepathy-doc: $(folks_telepathy_doc_files)
$(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)
-
-# 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
+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
distclean-local: distclean-docs
distclean-docs:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]