portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-order dependencies between modules

Browse source
This commit is contained in:
Riccardo Schirone 2021-01-21 09:59:22 +01:00 committed by Riccardo Schirone
parent 1ce3f53fb5
commit c803e5bb8c
13 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
librz/analysis/meson.build
View file

@ -174,14 +174,14 @@ rz_analysis = library('rz_analysis', rz_analysis_sources,
dependencies: [
rz_util_dep,
rz_reg_dep,
rz_asm_dep,
rz_crypto_dep,
rz_syscall_dep,
rz_search_dep,
rz_cons_dep,
rz_parse_dep,
rz_syscall_dep,
rz_flag_dep,
rz_hash_dep,
rz_crypto_dep,
rz_parse_dep,
rz_asm_dep,
java_dep,
capstone_dep
],

7
librz/asm/meson.build
View file

@ -220,12 +220,13 @@ rz_asm = library('rz_asm', rz_asm_sources,
include_directories: rz_asm_inc,
c_args: library_cflags,
dependencies: [
rz_util_dep,
rz_syscall_dep,
rz_parse_dep,
rz_lang_dep,
rz_util_dep,
rz_parse_dep,
rz_flag_dep,
rz_socket_dep,
rz_cons_dep,
rz_reg_dep,
capstone_dep,
java_dep
],

7
librz/bin/meson.build
View file

@ -142,12 +142,13 @@ rz_bin = library('rz_bin', rz_bin_sources,
c_args: ['-DRZ_API_BIN_ONLY=1'] + library_cflags,
dependencies: [
rz_util_dep,
rz_cons_dep,
rz_io_dep,
rz_hash_dep,
rz_magic_dep,
rz_socket_dep,
rz_magic_dep,
rz_hash_dep,
rz_syscall_dep,
rz_cons_dep,
rz_crypto_dep,
java_dep,
lz4_dep,
yxml_dep

34
librz/core/meson.build
View file

@ -92,26 +92,26 @@ endif
rz_core_inc = [platform_inc, include_directories(rz_core_inc)]
rz_core_deps = [
rz_util_dep,
rz_reg_dep,
rz_syscall_dep,
rz_search_dep,
rz_cons_dep,
rz_analysis_dep,
rz_socket_dep,
rz_io_dep,
rz_lang_dep,
rz_magic_dep,
rz_hash_dep,
rz_flag_dep,
rz_parse_dep,
rz_egg_dep,
rz_debug_dep,
rz_crypto_dep,
rz_config_dep,
rz_bin_dep,
rz_cons_dep,
rz_io_dep,
rz_util_dep,
rz_flag_dep,
rz_asm_dep,
rz_debug_dep,
rz_hash_dep,
rz_bin_dep,
rz_lang_dep,
rz_analysis_dep,
rz_parse_dep,
rz_bp_dep,
rz_egg_dep,
rz_reg_dep,
rz_search_dep,
rz_syscall_dep,
rz_socket_dep,
rz_magic_dep,
rz_crypto_dep,
platform_deps,
gdb_dep,
java_dep,

2
librz/crypto/meson.build
View file

@ -23,7 +23,7 @@ rz_crypto_sources = [
rz_crypto = library('rz_crypto', rz_crypto_sources,
include_directories: [platform_inc],
dependencies: [rz_util_dep],
dependencies: [rz_hash_dep, rz_util_dep],
c_args: library_cflags,
install: true,
implicit_include_directories: false,

28
librz/debug/meson.build
View file

@ -33,23 +33,23 @@ rz_debug_sources = [
]
rz_debug_deps = [
rz_util_dep,
rz_hash_dep,
rz_reg_dep,
rz_syscall_dep,
rz_analysis_dep,
rz_flag_dep,
rz_io_dep,
rz_bp_dep,
rz_search_dep,
rz_cons_dep,
rz_lang_dep,
rz_egg_dep,
winkd_dep,
qnx_dep,
gdb_dep,
bochs_dep,
rz_socket_dep
winkd_dep,
rz_egg_dep,
rz_analysis_dep,
rz_io_dep,
rz_parse_dep,
rz_crypto_dep,
rz_hash_dep,
rz_socket_dep,
rz_reg_dep,
rz_bp_dep,
rz_syscall_dep,
rz_flag_dep,
rz_cons_dep,
rz_util_dep,
]
if host_machine.system() == 'linux' or host_machine.system() == 'android'

7
librz/egg/meson.build
View file

@ -18,9 +18,14 @@ rz_egg = library('rz_egg', rz_egg_sources,
include_directories: [platform_inc],
c_args: library_cflags,
dependencies: [
rz_util_dep,
rz_asm_dep,
rz_syscall_dep,
rz_util_dep,
rz_parse_dep,
rz_reg_dep,
rz_lang_dep,
rz_flag_dep,
rz_cons_dep,
mpc_dep
],
install: true,

12
librz/io/meson.build
View file

@ -51,18 +51,18 @@ endif
rz_io_deps = [
rz_util_dep,
rz_socket_dep,
rz_hash_dep,
rz_crypto_dep,
rz_cons_dep, # transitive from gdb_dep, but must be explicitly listed here or meson will break the rpath
bochs_dep,
gdb_dep,
winkd_dep,
qnx_dep,
zip_dep,
ar_dep,
pth
pth,
rz_crypto_dep,
rz_hash_dep,
rz_socket_dep,
rz_cons_dep, # transitive from gdb_dep, but must be explicitly listed here or meson will break the rpath
rz_util_dep,
]
if host_machine.system() == 'windows'

2
librz/parse/meson.build
View file

@ -25,8 +25,8 @@ rz_parse = library('rz_parse', rz_parse_sources,
include_directories: platform_inc,
c_args: library_cflags,
dependencies: [
rz_util_dep,
rz_flag_dep,
rz_util_dep,
rz_syscall_dep,
rz_reg_dep,
rz_cons_dep,

2
librz/util/meson.build
View file

@ -86,7 +86,7 @@ rz_util_sources = [
'subprocess.c',
]
rz_util_deps = [ldl, mth, spp_dep, pth, utl, sdb_dep, zlib_dep, platform_deps]
rz_util_deps = [ldl, lrt, mth, spp_dep, pth, utl, sdb_dep, zlib_dep, platform_deps]
if host_machine.system().startswith('freebsd') or host_machine.system().startswith('netbsd') or host_machine.system().startswith('haiku')
# backtrace_symbols_fd requires -lexecinfo
rz_util_deps += [cc.find_library('execinfo')]

2
shlr/gdb/meson.build
View file

@ -24,7 +24,7 @@ gdb_inc = [
librzgdb = static_library('r2gdb', gdb_files,
include_directories: gdb_inc,
dependencies: [rz_util_dep, rz_cons_dep],
dependencies: [rz_util_dep, rz_cons_dep, rz_socket_dep],
implicit_include_directories: false
)

5
shlr/meson.build
View file

@ -278,7 +278,6 @@ java_dep = declare_dependency(
# handle qnx dependency
qnx_files = [
'qnx/src/core.c',
'qnx/src/libqnxr.c',
'qnx/src/packet.c',
'qnx/src/sigutil.c',
'qnx/src/utils.c',
@ -287,7 +286,7 @@ qnx_files = [
qnx_inc = [platform_inc, include_directories('qnx/include')]
librzqnx = static_library('rzqnx', qnx_files,
dependencies: [rz_socket_dep],
dependencies: [rz_socket_dep, rz_util_dep],
include_directories: qnx_inc,
implicit_include_directories: false
)
@ -461,7 +460,7 @@ winkd_files = [
winkd_inc = [platform_inc, include_directories('winkd')]
librzwinkd = static_library('rzwinkd', winkd_files,
dependencies: [rz_hash_dep, rz_crypto_dep, rz_socket_dep, rz_util_dep],
dependencies: [rz_crypto_dep, rz_hash_dep, rz_socket_dep, rz_util_dep],
include_directories: winkd_inc,
implicit_include_directories: false
)

6
shlr/qnx/src/libqnxr.c
View file

@ -1,6 +0,0 @@
/* libqnxr - LGPL - Copyright 2016 - madprogrammer */
#include "libqnxr.h"
#include "core.h"
#include <stdio.h>