meson: Match upstream gtkdoc changes

This commit is contained in:
Patrick Griffis 2016-12-09 13:51:41 -05:00 committed by Matthias Clasen
parent 0df9aab053
commit bc2bb5639b
3 changed files with 3 additions and 17 deletions

View File

@ -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',

View File

@ -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',

View File

@ -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',