diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-02-16 01:24:48 +0100 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2017-02-21 08:34:32 +0100 |
| commit | c5eac4907f9a99280064aa001485f9696f5ebe10 (patch) | |
| tree | 16ab91a422ef6b814cdfdd99a7266a22613a9544 /libs | |
| parent | a0f3f0be1374458328f73d89e5dbb711009a0fb7 (diff) | |
| download | grilo-c5eac4907f9a99280064aa001485f9696f5ebe10.tar.gz | |
build: Improve docs and introspection
https://bugzilla.gnome.org/show_bug.cgi?id=778612
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/meson.build | 2 | ||||
| -rw-r--r-- | libs/net/meson.build | 13 | ||||
| -rw-r--r-- | libs/pls/meson.build | 9 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libs/meson.build b/libs/meson.build index 458f214..be874cb 100644 --- a/libs/meson.build +++ b/libs/meson.build @@ -5,6 +5,8 @@ # # Copyright (C) 2016 Igalia S.L. All rights reserved. +libs_inc = include_directories('.') + if enable_grlnet subdir('net') endif diff --git a/libs/net/meson.build b/libs/net/meson.build index fe971db..de9b6a6 100644 --- a/libs/net/meson.build +++ b/libs/net/meson.build @@ -35,20 +35,15 @@ libgrlnet = shared_library('grlnet-@0@'.format(grl_majorminor), include_directories: libgrl_inc) if enable_gir - gir_extra_args = [ - '--c-include=net/grl-net.h', - '--cflags-begin', - '-I' + '@0@/libs'.format(meson.source_root()), - '--cflags-end', - ] - grlnet_gir = gnome.generate_gir(libgrlnet, - sources: grlnet_headers, + sources: grlnet_headers + grlnet_sources, namespace: 'GrlNet', nsversion: grl_majorminor, identifier_prefix: 'GrlNet', symbol_prefix: 'grl_net', + dependencies: [ gobject_dep, gio_dep, libsoup_dep ], includes: [ 'GObject-2.0', 'Gio-2.0', 'Soup-2.4' ], + include_directories: libs_inc, install: true, - extra_args: gir_extra_args) + extra_args: [ '--c-include=net/grl-net.h' ]) endif diff --git a/libs/pls/meson.build b/libs/pls/meson.build index 66c4ff2..1dfc51c 100644 --- a/libs/pls/meson.build +++ b/libs/pls/meson.build @@ -30,11 +30,14 @@ libgrlpls = shared_library('grlpls-@0@'.format(grl_majorminor), if enable_gir gnome.generate_gir(libgrlpls, - sources: grlpls_headers, + sources: grlpls_headers + grlpls_sources, namespace: 'GrlPls', nsversion: grl_majorminor, identifier_prefix: 'GrlPls', symbol_prefix: 'grl_pls', - includes: [ 'GObject-2.0', 'Gio-2.0' ], - install: true) + dependencies: [ gobject_dep, gio_dep ], + includes: [ 'GObject-2.0', 'Gio-2.0', grl_gir[0] ], + include_directories: libs_inc, + install: true, + extra_args: [ '--c-include=pls/grl-pls.h' ]) endif |