1
0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-11 11:44:03 +02:00

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
docs/reference

@@ -101,11 +101,7 @@ if get_option('with-docs')
gobject_typesfile : 'gio.types', gobject_typesfile : 'gio.types',
mode : 'none', mode : 'none',
dependencies : [libgio_dep, libgobject_dep, libglib_dep], dependencies : [libgio_dep, libgobject_dep, libglib_dep],
src_dir : [ src_dir : 'gio',
# TODO: Cleanup upstream
join_paths(meson.source_root(), 'gio'),
join_paths(meson.build_root(), 'gio'),
],
scan_args : [ scan_args : [
'--rebuild-types', '--rebuild-types',
'--deprecated-guards=G_DISABLE_DEPRECATED', '--deprecated-guards=G_DISABLE_DEPRECATED',

@@ -49,13 +49,7 @@ if get_option('with-docs')
main_xml : 'glib-docs.xml', main_xml : 'glib-docs.xml',
namespace : 'g', namespace : 'g',
mode : 'none', mode : 'none',
src_dir : [ src_dir : [ 'glib', 'gmodule' ],
# 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'),
],
dependencies : libglib_dep, dependencies : libglib_dep,
scan_args : [ scan_args : [
'--rebuild-types', '--rebuild-types',

@@ -23,11 +23,7 @@ if get_option('with-docs')
gobject_typesfile : 'gobject.types', gobject_typesfile : 'gobject.types',
mode : 'none', mode : 'none',
dependencies : [libgobject_dep, libglib_dep], dependencies : [libgobject_dep, libglib_dep],
src_dir : [ src_dir : 'gobject',
# TODO: Cleanup upstream
join_paths(meson.source_root(), 'gobject'),
join_paths(meson.build_root(), 'gobject'),
],
scan_args : [ scan_args : [
'--deprecated-guards=G_DISABLE_DEPRECATED', '--deprecated-guards=G_DISABLE_DEPRECATED',
'--ignore-decorators=G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT', '--ignore-decorators=G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT',