From 9a07606b84ec124232f3daddb15e169cc395bf91 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 22 Jul 2019 15:25:28 +0100 Subject: [PATCH] meson: replace last uses of libxmlconfig with idep_xmlconfig Signed-off-by: Eric Engestrom Acked-by: Eric Anholt Tested-by: Vinson Lee --- src/amd/vulkan/meson.build | 3 +-- src/egl/meson.build | 3 ++- src/gallium/auxiliary/pipe-loader/meson.build | 8 ++++---- src/gallium/targets/pipe-loader/meson.build | 2 +- src/gbm/meson.build | 4 ++-- src/glx/meson.build | 7 +++++-- src/util/meson.build | 4 ++-- src/vulkan/wsi/meson.build | 3 +-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 0ff6bbdbdd0..9278f1144d9 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -153,12 +153,11 @@ libvulkan_radeon = shared_library( ], link_with : [ libamd_common, libamdgpu_addrlib, libvulkan_wsi, - libxmlconfig ], dependencies : [ dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m, dep_valgrind, radv_deps, - idep_mesautil, idep_nir, idep_vulkan_util, idep_amdgfxregs_h, + idep_mesautil, idep_nir, idep_vulkan_util, idep_amdgfxregs_h, idep_xmlconfig, ], c_args : [c_vis_args, no_override_init_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags], diff --git a/src/egl/meson.build b/src/egl/meson.build index f81f85b7e74..14aca2a2186 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -92,7 +92,8 @@ if with_dri2 'drivers/dri2/egl_dri2.h', 'drivers/dri2/egl_dri2_fallbacks.h', ) - link_for_egl += [libloader, libxmlconfig] + deps_for_egl += idep_xmlconfig + link_for_egl += libloader incs_for_egl += inc_loader files_egl += files('drivers/dri2/platform_device.c') diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build index c0b9a53cf65..0e4b1ded5c5 100644 --- a/src/gallium/auxiliary/pipe-loader/meson.build +++ b/src/gallium/auxiliary/pipe-loader/meson.build @@ -46,8 +46,8 @@ libpipe_loader_static = static_library( inc_gallium_winsys, ], c_args : [c_vis_args, libpipe_loader_defines, '-DGALLIUM_STATIC_TARGETS=1'], - link_with : [libloader, libxmlconfig], - dependencies : [dep_libdrm], + link_with : libloader, + dependencies : [dep_libdrm, idep_xmlconfig], build_by_default : false, ) @@ -64,7 +64,7 @@ libpipe_loader_dynamic = static_library( join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe') ) ], - link_with : [libloader, libxmlconfig], - dependencies : [dep_libdrm], + link_with : libloader, + dependencies : [dep_libdrm, idep_xmlconfig], build_by_default : false, ) diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build index 045eb4174a7..614cad6cecd 100644 --- a/src/gallium/targets/pipe-loader/meson.build +++ b/src/gallium/targets/pipe-loader/meson.build @@ -52,7 +52,7 @@ pipe_loaders = [ [with_gallium_nouveau, 'nouveau', driver_nouveau, [], []], [with_gallium_r300, 'r300', driver_r300, [], []], [with_gallium_r600, 'r600', driver_r600, [], []], - [with_gallium_radeonsi, 'radeonsi', driver_radeonsi, [libxmlconfig], [xmlpool_options_h]], + [with_gallium_radeonsi, 'radeonsi', [driver_radeonsi, idep_xmlconfig], [], []], [with_gallium_freedreno, 'msm', driver_freedreno, [], []], [with_gallium_svga, 'vmwgfx', driver_svga, [], []], [with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null], []], diff --git a/src/gbm/meson.build b/src/gbm/meson.build index ff39d6962d0..311bcc74efc 100644 --- a/src/gbm/meson.build +++ b/src/gbm/meson.build @@ -49,8 +49,8 @@ libgbm = shared_library( include_directories : incs_gbm, c_args : [c_vis_args, args_gbm], link_args : [ld_args_gc_sections], - link_with : [libloader, libxmlconfig], - dependencies : [deps_gbm, dep_dl, dep_thread, idep_mesautil], + link_with : libloader, + dependencies : [deps_gbm, dep_dl, dep_thread, idep_mesautil, idep_xmlconfig], version : '1.0.0', install : true, ) diff --git a/src/glx/meson.build b/src/glx/meson.build index 3079959145b..85f2697f08d 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -145,10 +145,13 @@ libglx = static_library( '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]), ], link_with : [ - libloader, libloader_dri3_helper, libxmlconfig, + libloader, libloader_dri3_helper, extra_libs_libglx, ], - dependencies : [idep_mesautil, dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd], + dependencies : [ + idep_mesautil, idep_xmlconfig, + dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd, + ], ) libgl = shared_library( diff --git a/src/util/meson.build b/src/util/meson.build index be36c738bbb..95aff3b442f 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -147,7 +147,7 @@ idep_mesautil = declare_dependency( dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], ) -libxmlconfig = static_library( +_libxmlconfig = static_library( 'xmlconfig', files_xmlconfig, include_directories : inc_common, @@ -167,7 +167,7 @@ libxmlconfig = static_library( idep_xmlconfig = declare_dependency( sources : xmlpool_options_h, include_directories : inc_util, - link_with : libxmlconfig, + link_with : _libxmlconfig, dependencies : dep_expat, ) diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index 01b5f39da4b..6cf9a04f3b4 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -42,8 +42,7 @@ libvulkan_wsi = static_library( 'vulkan_wsi', files_vulkan_wsi, include_directories : [inc_common, inc_include], - link_with: [libxmlconfig], - dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util], + dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util, idep_xmlconfig], c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, ) -- 2.30.2