diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-09-23 20:41:04 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-09-28 20:41:32 -0300 |
| commit | b51fd6184a85b43f7b4a260706971303ecb8090a (patch) | |
| tree | 952950e7ca11c234657f10e013ab9c97102472b9 | |
| parent | 08397318f6b39ff6b532b9d19b23aeab696ab978 (diff) | |
meson: Fix gtkdoc using new meson features
| -rw-r--r-- | docs/libs/meson.build | 13 | ||||
| -rw-r--r-- | docs/meson.build | 2 | ||||
| -rw-r--r-- | ges/meson.build | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/docs/libs/meson.build b/docs/libs/meson.build index cd974199..6fb47340 100644 --- a/docs/libs/meson.build +++ b/docs/libs/meson.build @@ -1,4 +1,4 @@ -configure_file(input : 'ges.types', +types = configure_file(input : 'ges.types', output : 'ges.types', configuration : configuration_data()) @@ -16,12 +16,19 @@ foreach doc_dep : doc_deps_names endif endforeach -gnome.gtkdoc('gst-editing-services-@0@'.format(apiversion), +gnome.gtkdoc('ges', main_sgml : 'ges-docs.sgml', src_dir : '@0@/../../ges'.format(meson.current_source_dir()), scan_args : ['--deprecated-guards=GST_DISABLE_DEPRECATED', '--ignore-decorators=GST_EXPORT', '--ignore-headers=gesmarshal.h ges-internal.h ges-auto-transition.h ges-structured-interface.h ges-structure-parser.h ges-smart-video-mixer.h gstframepositioner.h' ], + scanobj_args : ['--type-init-func="gst_init(NULL,NULL)'], + gobject_typesfile : types, + dependencies : [ges_dep], fixxref_args: doc_deps + ['--html-dir=' + get_option('prefix') + '/share/gtk-doc/html/'], - install : true) + content_files : ['architecture.xml', 'ges-sections.txt', version_entities], + html_assets : 'layer_track_overview.png', + install : true, + install_dir : 'gstreamer-editing-services', +) diff --git a/docs/meson.build b/docs/meson.build index d0fe6a98..c89a68c5 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -4,7 +4,7 @@ docconf.set('GST_API_VERSION', apiversion) docconf.set('PACKAGE_VERSION', gst_version) docconf.set('PLUGINDIR', '@0@/lib/gstreamer-1.0'.format(get_option('prefix'))) -configure_file(input : 'version.entities.in', +version_entities = configure_file(input : 'version.entities.in', output : 'version.entities', configuration : docconf) diff --git a/ges/meson.build b/ges/meson.build index 32f0fafd..7aa1543b 100644 --- a/ges/meson.build +++ b/ges/meson.build @@ -190,5 +190,6 @@ endif ges_dep = declare_dependency(link_with : libges, include_directories : [configinc], - sources : ges_gen_sources + sources : ges_gen_sources, + dependencies : libges_deps, ) |