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
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])
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 \
$(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 \
$(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 \
$(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
$(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: