luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gdbusegdoc' into 'master'

Browse Source 
docs: Fix configuration with gtk_doc=true and installed_tests=false

See merge request GNOME/glib!1424
This commit is contained in:
Sebastian Dröge 2020-04-01 11:20:59 +00:00
commit aa5cb26c6e
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
docs/reference/gio/meson.build
View File

@ -1,5 +1,7 @@
if get_option('gtk_doc') if get_option('gtk_doc')
subdir('gdbus-object-manager-example') if installed_tests_enabled
subdir('gdbus-object-manager-example')
endif
subdir('xml') subdir('xml')
ignore_headers = [ ignore_headers = [
@ -160,6 +162,30 @@ if get_option('gtk_doc')
copy : true, copy : true,
) )
content_files = [
'overview.xml',
'migrating-posix.xml',
'migrating-gnome-vfs.xml',
'migrating-gconf.xml',
'migrating-gdbus.xml',
'gio-querymodules.xml',
'glib-compile-schemas.xml',
'glib-compile-resources.xml',
'gapplication.xml',
'gsettings.xml',
'gresource.xml',
'gdbus.xml',
'gdbus-codegen.xml',
]
if installed_tests_enabled
content_files += [
gdbus_example_objectmanager_xml,
gdbus_example_objectmanager_sources,
gdbus_object_manager_example_doc
]
endif
gnome.gtkdoc('gio', gnome.gtkdoc('gio',
main_xml : 'gio-docs.xml', main_xml : 'gio-docs.xml',
namespace : 'g', namespace : 'g',
@ -173,24 +199,7 @@ if get_option('gtk_doc')
mkdb_args : [ mkdb_args : [
'--ignore-files=' + ' '.join(ignore_sources), '--ignore-files=' + ' '.join(ignore_sources),
], ],
content_files : [ content_files : content_files,
'overview.xml',
'migrating-posix.xml',
'migrating-gnome-vfs.xml',
'migrating-gconf.xml',
'migrating-gdbus.xml',
'gio-querymodules.xml',
'glib-compile-schemas.xml',
'glib-compile-resources.xml',
'gapplication.xml',
'gsettings.xml',
'gresource.xml',
'gdbus.xml',
'gdbus-codegen.xml',
gdbus_example_objectmanager_xml,
gdbus_example_objectmanager_sources,
gdbus_object_manager_example_doc,
],
expand_content_files : [ expand_content_files : [
'overview.xml', 'overview.xml',
'migrating-posix.xml', 'migrating-posix.xml',