[gnome-contacts/wip/nielsdg/fix-docs-build] build: Fix the valadoc target
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts/wip/nielsdg/fix-docs-build] build: Fix the valadoc target
- Date: Sat, 16 Feb 2019 23:09:25 +0000 (UTC)
commit 5c5aa5556126c929c060e1896d43ff5a5a26fc6c
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sat Feb 16 21:52:35 2019 +0100
build: Fix the valadoc target
Fixes #122
docs/meson.build | 10 +++++++++-
src/contacts-typeset.vala | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/docs/meson.build b/docs/meson.build
index 54dfbd8..b2c82d2 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,11 @@
+docs_vapidirs = [
+ '--vapidir=@0@'.format(join_paths(meson.source_root(), 'vapi')),
+]
+
+if libhandy_vapidir != ''
+ docs_vapidirs += '--vapidir=@0@'.format(libhandy_vapidir )
+endif
+
custom_target('docs',
input: contacts_vala_sources,
output: 'docs',
@@ -19,8 +27,8 @@ custom_target('docs',
'--pkg=libhandy-0.0',
'--pkg=custom',
'--pkg=config',
- '--vapidir=@0@'.format(join_paths(meson.source_root(), 'vapi')),
'--directory=@OUTDIR@',
+ docs_vapidirs,
[ libcontacts_sources, contacts_vala_sources ],
],
build_by_default: true,
diff --git a/src/contacts-typeset.vala b/src/contacts-typeset.vala
index c0071f1..87878a2 100644
--- a/src/contacts-typeset.vala
+++ b/src/contacts-typeset.vala
@@ -107,7 +107,7 @@ public class Contacts.TypeSet : Object {
* {@link Typeset}'s store, if any.
*
* @param display_name: The translated display name
- * @return: The appropriate TypeDescriptor or null if no match was found.
+ * @return The appropriate TypeDescriptor or null if no match was found.
*/
public unowned TypeDescriptor? lookup_descriptor_in_store (string display_name) {
TreeIter iter;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]