diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2013-07-05 15:20:13 -0700 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2013-07-05 16:16:44 -0700 |
| commit | b8f430b58ac2836e8b341c9ba324cbf7eca8a136 (patch) | |
| tree | efed4565f268faa6eff24a497f8d44d87516ed3a /docs | |
| parent | a945327bcbbab2af0c4871e9cbb70080ec71db8b (diff) | |
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.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index fdaa52d5..cfa79fb9 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 \ |