project: style fixups to meson

This commit is contained in:
Georges Basile Stavracas Neto
2017-09-09 10:09:02 -03:00
parent ea548d1584
commit 290d4bb7a6
+11 -14
View File
@@ -14,8 +14,8 @@ version_conf.set('VERSION', calendar_version)
version = 'version.xml' version = 'version.xml'
version_xml = configure_file( version_xml = configure_file(
input: version + '.in', input: version + '.in',
output: version, output: version,
configuration: version_conf configuration: version_conf
) )
@@ -29,16 +29,16 @@ doc_path = join_paths(calendar_datadir, 'gtk-doc', 'html', meson.project_name())
gnome.gtkdoc( gnome.gtkdoc(
meson.project_name(), meson.project_name(),
main_sgml: meson.project_name() + '-docs.sgml', main_sgml: meson.project_name() + '-docs.sgml',
src_dir: src_inc, src_dir: src_inc,
dependencies: libgcal_dep, dependencies: libgcal_dep,
scan_args: '--rebuild-types', scan_args: '--rebuild-types',
mkdb_args: [ mkdb_args: [ '--sgml-mode', '--output-format=xml' ],
'--sgml-mode',
'--output-format=xml'
],
gobject_typesfile: meson.project_name() + '.types', gobject_typesfile: meson.project_name() + '.types',
fixxref_args: [ html_assets: html_images,
install: true,
install_dir: doc_path
fixxref_args: [
'--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'evolution-data-server')), '--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'evolution-data-server')),
'--extra-dir=@0@'.format(join_paths(glib_doc_path, 'glib')), '--extra-dir=@0@'.format(join_paths(glib_doc_path, 'glib')),
'--extra-dir=@0@'.format(join_paths(glib_doc_path, 'gobject')), '--extra-dir=@0@'.format(join_paths(glib_doc_path, 'gobject')),
@@ -46,7 +46,4 @@ gnome.gtkdoc(
'--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'gdk')), '--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'gdk')),
'--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'gtk')) '--extra-dir=@0@'.format(join_paths(gtk_doc_path, 'gtk'))
], ],
html_assets: html_images,
install: true,
install_dir: doc_path
) )