fixup! fixup! meson: enable support for gtk-doc

doc/reference/meson.build

@@ -7,11 +7,20 @@ configure_file(input : 'version.xml.in',
 
 gnome.gtkdoc(
   meson.project_name(),
-  src_dir: join_paths(meson.build_root(), meson.project_name()),
-  dependencies: [ dependency('glib-2.0'), gobject_dep ],
-  mkdb_args: [ '--sgml-mode', '--output-format=xml' ],
+  src_dir: join_paths(meson.source_root(), 'playerctl'),
+  dependencies: [
+    playerctl_shared_link,
+    dependency('glib-2.0'),
+  ],
+  mkdb_args: [
+    '--sgml-mode',
+    '--output-format=xml',
+    '--name-space=meson.project_name()',
+  ],
+  scan_args: [
+    '--deprecated-guards="PLAYERCTL_DISABLE_DEPRECATED"',
+  ],
   gobject_typesfile: meson.project_name() + '.types',
-  scan_args: '--deprecated-guards="PLAYERCTL_DISABLE_DEPRECATED"',
   fixxref_args: [
     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),

meson.build

@@ -7,10 +7,12 @@ pkg = import('pkgconfig')
 
 version_conf = configuration_data()
 
-version_conf.set('PLAYERCTL_VERSION', '0.5.0')
-version_conf.set('PLAYERCTL_MAJOR_VERSION', '0')
-version_conf.set('PLAYERCTL_MINOR_VERSION', '5')
-version_conf.set('PLAYERCTL_MICRO_VERSION', '0')
+playerctl_version = meson.project_version()
+version_array = playerctl_version.split('.')
+version_conf.set('PLAYERCTL_VERSION', meson.project_version())
+version_conf.set('PLAYERCTL_MAJOR_VERSION', version_array[0].to_int())
+version_conf.set('PLAYERCTL_MINOR_VERSION', version_array[1].to_int())
+version_conf.set('PLAYERCTL_MICRO_VERSION', version_array[2].to_int())
 
 gobject_dep = dependency('gobject-2.0', version: '>=2.38')
 gio_dep = dependency('gio-unix-2.0')

playerctl/meson.build

@@ -42,6 +42,13 @@ playerctl_executable = executable(
   include_directories: configuration_inc,
   install: true)
 
+# Required for gtk-doc
+playerctl_shared_link = declare_dependency(
+  include_directories: include_directories('.'),
+  link_with: [ playerctl_shared ],
+  dependencies: deps,
+)
+
 install_headers(headers, install_dir: join_paths(get_option('includedir'), 'playerctl'))
 
 if get_option('introspection')