[glib/wip/meson: 7/35] meson: Match upstream gtkdoc changes
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/meson: 7/35] meson: Match upstream gtkdoc changes
- Date: Mon, 8 May 2017 12:34:31 +0000 (UTC)
commit 22850a84d71089c08d0ef884548b8afbcdb22249
Author: Patrick Griffis <tingping tingping se>
Date: Fri Dec 9 13:51:41 2016 -0500
meson: Match upstream gtkdoc changes
docs/reference/gio/meson.build | 6 +-----
docs/reference/glib/meson.build | 8 +-------
docs/reference/gobject/meson.build | 6 +-----
3 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index 01db208..1a0edbe 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -101,11 +101,7 @@ if get_option('with-docs')
gobject_typesfile : 'gio.types',
mode : 'none',
dependencies : [libgio_dep, libgobject_dep, libglib_dep],
- src_dir : [
- # TODO: Cleanup upstream
- join_paths(meson.source_root(), 'gio'),
- join_paths(meson.build_root(), 'gio'),
- ],
+ src_dir : 'gio',
scan_args : [
'--rebuild-types',
'--deprecated-guards=G_DISABLE_DEPRECATED',
diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build
index 86adb92..b76b9e4 100644
--- a/docs/reference/glib/meson.build
+++ b/docs/reference/glib/meson.build
@@ -49,13 +49,7 @@ if get_option('with-docs')
main_xml : 'glib-docs.xml',
namespace : 'g',
mode : 'none',
- src_dir : [
- # TODO: Cleanup upstream
- join_paths(meson.source_root(), 'glib'),
- join_paths(meson.build_root(), 'glib'),
- join_paths(meson.source_root(), 'gmodule'),
- join_paths(meson.build_root(), 'gmodule'),
- ],
+ src_dir : [ 'glib', 'gmodule' ],
dependencies : libglib_dep,
scan_args : [
'--rebuild-types',
diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build
index 2eca238..fc3de24 100644
--- a/docs/reference/gobject/meson.build
+++ b/docs/reference/gobject/meson.build
@@ -23,11 +23,7 @@ if get_option('with-docs')
gobject_typesfile : 'gobject.types',
mode : 'none',
dependencies : [libgobject_dep, libglib_dep],
- src_dir : [
- # TODO: Cleanup upstream
- join_paths(meson.source_root(), 'gobject'),
- join_paths(meson.build_root(), 'gobject'),
- ],
+ src_dir : 'gobject',
scan_args : [
'--deprecated-guards=G_DISABLE_DEPRECATED',
'--ignore-decorators=G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]