From 1b5df6096a63cc7368e580210e66a90334836686 Mon Sep 17 00:00:00 2001 From: Jason Francis Date: Tue, 1 Jun 2021 19:40:07 -0400 Subject: [PATCH] docs: include wp.h in gir sources --- docs/meson.build | 5 +++-- lib/wp/meson.build | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index 0bbbbdf5..67d60848 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -40,7 +40,7 @@ if build_doc or build_gir configuration: doxy_wp_conf_data ) - doxyxml_wp_depfiles = [wp_lib_sources, wp_lib_parse_headers] + doxyxml_wp_depfiles = [wp_lib_sources, wp_lib_headers] doxyxml_wp = custom_target('doxyxml_wp', command: [doxygen_p, doxyfile_wp], depend_files: doxyxml_wp_depfiles, @@ -128,7 +128,8 @@ if build_gir dependencies: [wp_dep, dummy_dep], namespace: 'Wp', nsversion: wireplumber_api_version, - sources: [wpenums_h, wp_lib_parse_headers, wp_gtkdoc_h], + sources: [wpenums_h, wp_lib_headers, wp_gtkdoc_h], + include_directories: [wpenums_include_dir], includes: ['GLib-2.0', 'GObject-2.0', 'Gio-2.0'], install: true, ) diff --git a/lib/wp/meson.build b/lib/wp/meson.build index 82f183cc..ceb1b8b4 100644 --- a/lib/wp/meson.build +++ b/lib/wp/meson.build @@ -33,7 +33,7 @@ wp_lib_priv_sources = files( 'private/pipewire-object-mixin.c', ) -wp_lib_parse_headers = files( +wp_lib_headers = files( 'client.h', 'component-loader.h', 'core.h', @@ -62,9 +62,6 @@ wp_lib_parse_headers = files( 'spa-type.h', 'state.h', 'transition.h', -) - -wp_lib_headers = wp_lib_parse_headers + files( 'wp.h', ) @@ -73,7 +70,7 @@ install_headers(wp_lib_headers, ) enums = gnome.mkenums_simple('wpenums', - sources: wp_lib_parse_headers, + sources: wp_lib_headers, header_prefix: '#include "wp/defs.h"', decorator: 'WP_API', install_header: true, @@ -82,6 +79,7 @@ enums = gnome.mkenums_simple('wpenums', wpenums_h = enums[1] wpenums_c = enums[0] wp_gen_sources = [wpenums_h] +wpenums_include_dir = include_directories('.') wpversion_data = configuration_data() wpversion_data.set('version', meson.project_version())