meson: move expat dependency where it's needed
authorEric Engestrom <eric.engestrom@imgtec.com>
Wed, 18 Oct 2017 11:06:16 +0000 (12:06 +0100)
committerEric Engestrom <eric.engestrom@imgtec.com>
Wed, 18 Oct 2017 13:27:20 +0000 (14:27 +0100)
Suggested-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
src/intel/common/meson.build
src/intel/tools/meson.build

index 6b0af929d9ef481e3c4674efc3eb6409b633b5b9..db7d74a26d29a6ad7243566a2b6f8be3cc5ef454 100644 (file)
@@ -40,6 +40,6 @@ libintel_common = static_library(
   files_libintel_common,
   include_directories : [inc_common, inc_intel],
   c_args : [c_vis_args, no_override_init_args],
-  dependencies : dep_libdrm,
+  dependencies : [dep_expat, dep_libdrm],
   build_by_default : false,
 )
index 91092fdb5120df36d658a96a920dcc8c83f84c6b..1996d5208f026c9fe81bbd7e08d185e34a04fe91 100644 (file)
@@ -31,7 +31,7 @@ aubinator = executable(
 aubinator_error_decode = executable(
   'aubinator_error_decode',
   files('aubinator_error_decode.c', 'disasm.c', 'gen_disasm.h'),
-  dependencies : [dep_expat, dep_zlib, dep_thread],
+  dependencies : [dep_zlib, dep_thread],
   include_directories : [inc_common, inc_intel],
   link_with : [libintel_common, libintel_compiler, libmesa_util],
   c_args : [c_vis_args, no_override_init_args],