meson: replace libmesa_util with idep_mesautil

[mesa.git] / src / util / meson.build

diff --git a/src/util/meson.build b/src/util/meson.build
index 8aa7af921e133271c2189e4f1ace393adfd97513..d3c186366fb3a811f99cc432a5220e291627dc67 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -132,7 +132,7 @@ format_srgb = custom_target(
   capture : true,
 )
 
-libmesa_util = static_library(
+_libmesa_util = static_library(
   'mesa_util',
   [files_mesa_util, format_srgb],
   include_directories : inc_common,
@@ -141,12 +141,17 @@ libmesa_util = static_library(
   build_by_default : false
 )
 
+idep_mesautil = declare_dependency(
+  link_with : _libmesa_util,
+  include_directories : inc_util,
+  dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m],
+)
+
 libxmlconfig = static_library(
   'xmlconfig',
   files_xmlconfig,
   include_directories : inc_common,
-  link_with : libmesa_util,
-  dependencies : [dep_expat, dep_m],
+  dependencies : [idep_mesautil, dep_expat, dep_m],
   c_args : [
     c_msvc_compat_args, c_vis_args,
     '-DSYSCONFDIR="@0@"'.format(
@@ -173,7 +178,7 @@ if with_tests
       'u_atomic_test',
       files('u_atomic_test.c'),
       include_directories : inc_common,
-      link_with : libmesa_util,
+      dependencies : idep_mesautil,
       c_args : [c_msvc_compat_args],
     ),
     suite : ['util'],
@@ -197,7 +202,7 @@ if with_tests
       'mesa-sha1_test',
       files('mesa-sha1_test.c'),
       include_directories : inc_common,
-      link_with : libmesa_util,
+      dependencies : idep_mesautil,
       c_args : [c_msvc_compat_args],
     ),
     suite : ['util'],
@@ -209,8 +214,7 @@ if with_tests
        'bitset_test',
        files('bitset_test.cpp'),
        include_directories : inc_common,
-       dependencies : [dep_thread, dep_dl, idep_gtest],
-       link_with : libmesa_util,
+       dependencies : [idep_mesautil, dep_thread, dep_dl, idep_gtest],
      ),
      suite : ['util'],
   )