[folks] docs: only use one copy of the tp-zeitgeist interface
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] docs: only use one copy of the tp-zeitgeist interface
- Date: Fri, 5 Jul 2013 23:17:32 +0000 (UTC)
commit b8f430b58ac2836e8b341c9ba324cbf7eca8a136
Author: Travis Reitter <travis reitter collabora co uk>
Date: Fri Jul 5 15:20:13 2013 -0700
docs: only use one copy of the tp-zeitgeist interface
We can't include both tp-zeitgeist and tp-zeitgeist-dummy because valadoc
will complain of re-definitions. Using the dummy version seems to work even
if --enable-zeitgeist is used, so this should cover us in all cases.
docs/Makefile.am | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/docs/Makefile.am b/docs/Makefile.am
index fdaa52d..cfa79fb 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -128,7 +128,19 @@ $(folkstelepathydoc_DATA) $(folkstelepathyimg_DATA): \
$(NULL)
$(folkstelepathygtkdoc_DATA): folks-telepathy-gtk-doc.stamp
-folks_telepathy_doc_files = $(top_srcdir)/backends/telepathy/lib/*.vala
+# ensure we only have one set of tp-zeitgeist interfaces defined
+folks_telepathy_doc_files_blacklist = \
+ $(top_srcdir)/backends/telepathy/lib/tp-zeitgeist.vala \
+ $(NULL)
+# this expands the list of files, so we can filter out elements
+folks_telepathy_doc_files_all = \
+ $(wildcard $(top_srcdir)/backends/telepathy/lib/*.vala) \
+ $(NULL)
+# FIXME: sort the files manually to work around the native doclet portion of
+# bgo#662784
+folks_telepathy_doc_files = \
+ $(sort \
+ $(filter-out $(folks_telepathy_doc_files_blacklist),$(folks_telepathy_doc_files_all)))
folks_telepathy_doc_deps = \
gmodule-2.0 \
gio-2.0 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]