From 6c7811a45c6a39368650d664b6bd32b2cecaa89e Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 14 Nov 2018 14:59:57 -0800 Subject: [PATCH] De-duplicate dependency list --- meson.build | 56 +++++++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/meson.build b/meson.build index 667cffbca5..1bb9c05f90 100644 --- a/meson.build +++ b/meson.build @@ -368,25 +368,27 @@ secp256k1_dep = dependency('libsecp256k1', version: '>=0.1.0', fallback: ['secp2 libsni_dep = dependency('libsni', version: '>=0.5.0', fallback: ['libsni', 'libsni_dep']) +deps = [openssl_dep, + curl_dep, + libuv_dep, + libh2o_dep, + cmark_dep, + secp256k1_dep, + gmp_dep, + sigsegv_dep, + urbitscrypt_dep, + ed25519_dep, + murmur3_dep, + argon2_dep, + softfloat3_dep, + libsni_dep] + executable('urbit', sources : sources, include_directories : incdir, c_args : os_c_flags, link_args: os_link_flags, -dependencies: [openssl_dep, - curl_dep, - libuv_dep, - libh2o_dep, - cmark_dep, - secp256k1_dep, - gmp_dep, - sigsegv_dep, - urbitscrypt_dep, - ed25519_dep, - murmur3_dep, - argon2_dep, - softfloat3_dep, - libsni_dep] + os_deps, +dependencies: deps + os_deps, install: true) # XX shrink this list @@ -397,18 +399,7 @@ sources : test_sources + ['tests/hashtable_tests.c'], include_directories : incdir, c_args : os_c_flags, link_args: os_link_flags, -dependencies: [openssl_dep, - curl_dep, - libuv_dep, - libh2o_dep, - cmark_dep, - gmp_dep, - sigsegv_dep, - urbitscrypt_dep, - ed25519_dep, - murmur3_dep, - softfloat3_dep, - libsni_dep] + os_deps, +dependencies: deps + os_deps, install: false) test('test-hashtable', test_hashtable) @@ -420,18 +411,7 @@ sources : test_sources + ['tests/test.c'], include_directories : incdir, c_args : os_c_flags, link_args: os_link_flags, -dependencies: [openssl_dep, - curl_dep, - libuv_dep, - libh2o_dep, - cmark_dep, - gmp_dep, - sigsegv_dep, - urbitscrypt_dep, - ed25519_dep, - murmur3_dep, - softfloat3_dep, - libsni_dep] + os_deps, +dependencies: deps + os_deps, install: false) test('test-mem', test_mem, should_fail: true)