meson: set up a proper internal dependency for xmlconfig

Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>

5 files changed, 16 insertions, 9 deletions

diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index 8cccdfe1af8..e5b313c00df 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -36,7 +36,7 @@ endif
 
 libgallium_nine = shared_library(
   'd3dadapter9',
-  [files('description.c', 'getproc.c', 'drm.c'), xmlpool_options_h],
+  files('description.c', 'getproc.c', 'drm.c'),
   include_directories : [
     inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
     inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
@@ -53,7 +53,7 @@ libgallium_nine = shared_library(
     libswkmsdri, libnir,
   ],
   dependencies : [
-    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
+    dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
     driver_i915, driver_svga, driver_iris
   ],
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 28c9fb9372c..2f648398f46 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -39,7 +39,7 @@ endif
 
 libgallium_dri = shared_library(
   'gallium_dri',
-  [files('target.c'), xmlpool_options_h],
+  files('target.c'),
   include_directories : [
     inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
     inc_gallium_winsys, include_directories('../../state_trackers/dri'),
@@ -54,7 +54,7 @@ libgallium_dri = shared_library(
     libswkmsdri,
   ],
   dependencies : [
-    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
+    dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
     driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
     driver_tegra, driver_i915, driver_svga, driver_virgl,
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 04b477db58b..3c507126f08 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -150,9 +150,9 @@ endforeach
 
 libi965 = static_library(
   'i965',
-  [files_i965, ir_expression_operation_h, xmlpool_options_h],
+  [files_i965, ir_expression_operation_h],
   include_directories : [
-    inc_common, inc_intel, inc_dri_common, inc_util, inc_include,
+    inc_common, inc_intel, inc_dri_common, inc_include,
   ],
   c_args : [c_vis_args, no_override_init_args, c_sse2_args],
   cpp_args : [cpp_vis_args, c_sse2_args],
@@ -160,5 +160,5 @@ libi965 = static_library(
     i965_gen_libs, libintel_common, libintel_dev, libisl, libintel_compiler,
     libblorp, libintel_perf
   ],
-  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml],
+  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml, idep_xmlconfig],
 )
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
index 38f56998d69..d69acf1f75a 100644
--- a/src/mesa/drivers/dri/meson.build
+++ b/src/mesa/drivers/dri/meson.build
@@ -59,11 +59,11 @@ if _dri_drivers != []
     [],
     link_whole : _dri_drivers,
     link_with : [
-      libmegadriver_stub, libdricommon, libxmlconfig, libglapi, libmesa_util,
+      libmegadriver_stub, libdricommon, libglapi, libmesa_util,
       libmesa_classic,
     ],
     dependencies : [
-      dep_selinux, dep_libdrm, dep_expat, dep_m, dep_thread, dep_dl, idep_nir,
+      dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl, idep_nir, idep_xmlconfig,
     ],
     link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections],
     # Will be deleted during installation, see install_megadrivers.py
diff --git a/src/util/meson.build b/src/util/meson.build
index 23f8c68c701..67b6981d8b5 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -158,6 +158,13 @@ libxmlconfig = static_library(
   build_by_default : false,
 )
 
+idep_xmlconfig = declare_dependency(
+  sources : xmlpool_options_h,
+  include_directories : inc_util,
+  link_with : libxmlconfig,
+  dependencies : dep_expat,
+)
+
 if with_tests
   test(
     'u_atomic',