Clean dependencies between modules and put them in order

binrz/rz-asm/meson.build

@@ -2,12 +2,6 @@ executable('rz-asm', 'rz-asm.c',
   include_directories: [platform_inc],
   dependencies: [
     rz_main_dep,
-    rz_util_dep,
-    rz_asm_dep,
-    rz_analysis_dep,
-    rz_crypto_dep,
-    rz_syscall_dep,
-    rz_hash_dep
   ],
   install: true,
   install_rpath: rpath_exe,

binrz/rz-bin/meson.build

@@ -1,16 +1,7 @@
 executable('rz-bin', 'rz-bin.c',
   include_directories: [platform_inc],
   dependencies: [
-    rz_util_dep,
-    rz_cons_dep,
     rz_main_dep,
-    rz_config_dep,
-    rz_hash_dep,
-    rz_io_dep,
-    rz_crypto_dep,
-    rz_core_dep,
-    rz_magic_dep,
-    rz_bin_dep
   ],
   install: true,
   install_rpath: rpath_exe,

binrz/rz-hash/meson.build

@@ -1,12 +1,7 @@
 executable('rz-hash', 'rz-hash.c',
   include_directories: [platform_inc],
   dependencies: [
-    rz_util_dep,
     rz_main_dep,
-    rz_hash_dep,
-    rz_io_dep,
-    rz_crypto_dep,
-    rz_socket_dep
   ],
   install: true,
   install_rpath: rpath_exe,

librz/analysis/meson.build

@@ -173,13 +173,13 @@ rz_analysis = library('rz_analysis', rz_analysis_sources,
   c_args: library_cflags,
   dependencies: [
     rz_util_dep,
+    rz_crypto_dep,
     rz_reg_dep,
     rz_syscall_dep,
     rz_search_dep,
     rz_cons_dep,
     rz_flag_dep,
     rz_hash_dep,
-    rz_crypto_dep,
     rz_parse_dep,
     rz_asm_dep,
     java_dep,
@@ -202,9 +202,9 @@ pkgconfig_mod.generate(rz_analysis,
   libraries: pkgcfg_sanitize_libs,
   requires: [
     'rz_util',
+    'rz_crypto',
     'rz_reg',
     'rz_asm',
-    'rz_crypto',
     'rz_parse',
     'rz_syscall',
     'rz_search',

librz/analysis/p/analysis_avr.c

@@ -6,9 +6,9 @@ https://en.wikipedia.org/wiki/Atmel_AVR_instruction_set
 #endif
 
 #include <string.h>
+#include <rz_crypto.h>
 #include <rz_types.h>
 #include <rz_util.h>
-#include <rz_crypto.h>
 #include <rz_lib.h>
 #include <rz_asm.h>
 #include <rz_analysis.h>

librz/asm/meson.build

@@ -220,13 +220,10 @@ rz_asm = library('rz_asm', rz_asm_sources,
   include_directories: rz_asm_inc,
   c_args: library_cflags,
   dependencies: [
-    rz_syscall_dep,
-    rz_lang_dep,
     rz_util_dep,
-    rz_parse_dep,
+    rz_syscall_dep,
     rz_flag_dep,
-    rz_cons_dep,
-    rz_reg_dep,
+    rz_parse_dep,
     capstone_dep,
     java_dep
   ],
@@ -249,7 +246,6 @@ pkgconfig_mod.generate(rz_asm,
     'rz_util',
     'rz_syscall',
     'rz_parse',
-    'rz_lang',
     'rz_flag',
     'rz_socket'
   ],

librz/bin/meson.build

@@ -141,17 +141,16 @@ rz_bin = library('rz_bin', rz_bin_sources,
   include_directories: rz_bin_inc,
   c_args: ['-DRZ_API_BIN_ONLY=1'] + library_cflags,
   dependencies: [
+    java_dep,
+    lz4_dep,
+    yxml_dep,
     rz_util_dep,
-    rz_io_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
+    rz_io_dep,
   ],
   install: true,
   implicit_include_directories: false,

librz/core/meson.build

@@ -93,26 +93,26 @@ endif
 rz_core_inc = [platform_inc, include_directories(rz_core_inc)]
 
 rz_core_deps = [
-  rz_config_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_socket_dep,
+  rz_flag_dep,
+  rz_cons_dep,
+  rz_lang_dep,
+  rz_hash_dep,
   rz_crypto_dep,
+  rz_io_dep,
+  rz_reg_dep,
+  rz_bp_dep,
+  rz_syscall_dep,
+  rz_parse_dep,
+  rz_asm_dep,
+  rz_egg_dep,
+  rz_search_dep,
+  rz_analysis_dep,
+  rz_debug_dep,
+  rz_config_dep,
+  rz_bin_dep,
   platform_deps,
   gdb_dep,
   java_dep,

librz/crypto/meson.build

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

librz/debug/meson.build

@@ -37,19 +37,15 @@ rz_debug_deps = [
   gdb_dep,
   bochs_dep,
   winkd_dep,
-  rz_egg_dep,
-  rz_analysis_dep,
-  rz_io_dep,
-  rz_parse_dep,
-  rz_crypto_dep,
+  rz_util_dep,
+  rz_cons_dep,
   rz_hash_dep,
-  rz_socket_dep,
+  rz_io_dep,
   rz_reg_dep,
   rz_bp_dep,
   rz_syscall_dep,
-  rz_flag_dep,
-  rz_cons_dep,
-  rz_util_dep,
+  rz_egg_dep,
+  rz_analysis_dep,
 ]
 
 if host_machine.system() == 'linux' or host_machine.system() == 'android'
@@ -124,14 +120,10 @@ pkgconfig_mod.generate(rz_debug,
     'rz_reg',
     'rz_syscall',
     'rz_analysis',
-    'rz_flag',
     'rz_io',
     'rz_bp',
-    'rz_search',
     'rz_cons',
-    'rz_lang',
     'rz_egg',
-    'rz_socket'
   ],
   description: 'rizin foundation libraries'
 )

librz/debug/p/debug_bf.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
-#include <rz_asm.h>
 #include <rz_debug.h>
 #undef RZ_API
 #define RZ_API static inline

librz/debug/p/debug_bochs.c

@@ -1,6 +1,5 @@
 /* debugbochs  - LGPL - Copyright 2016 - SkUaTeR */
 
-#include <rz_asm.h>
 #include <rz_debug.h>
 #include <libbochs.h>
 

librz/debug/p/debug_esil.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 // r2 -Desil ls
 
-#include <rz_asm.h>
 #include <rz_debug.h>
 
 #if 0

librz/debug/p/debug_gdb.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_core.h>
-#include <rz_asm.h>
 #include <rz_debug.h>
 #include <libgdbr.h>
 #include <gdbclient/commands.h>

librz/debug/p/debug_io.c

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_io.h>
-#include <rz_asm.h>
 #include <rz_debug.h>
 
 static int __io_step(RzDebug *dbg) {

librz/debug/p/debug_native.c

@@ -3,7 +3,6 @@
 #include <rz_userconf.h>
 #include <rz_debug.h>
 #include <rz_drx.h>
-#include <rz_asm.h>
 #include <rz_core.h>
 #include <rz_reg.h>
 #include <rz_lib.h>

librz/debug/p/debug_qnx.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
-#include <rz_asm.h>
 #include <rz_debug.h>
 #include <libqnxr.h>
 

librz/debug/p/debug_rap.c

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
-#include <rz_asm.h>
 #include <rz_cons.h>
 #include <rz_debug.h>
 

librz/debug/p/debug_winkd.c

@@ -13,7 +13,6 @@
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library.
 
-#include <rz_asm.h>
 #include <rz_debug.h>
 #include <winkd.h>
 #include <kd.h>

librz/debug/p/native/linux/linux_debug.c

@@ -4,7 +4,6 @@
 
 #if DEBUGGER
 #include <rz_debug.h>
-#include <rz_asm.h>
 #include <rz_reg.h>
 #include <rz_lib.h>
 #include <rz_analysis.h>

librz/debug/p/native/xnu/xnu_debug.c

@@ -11,7 +11,6 @@
 // ------------------------------------
 
 #include <rz_debug.h>
-#include <rz_asm.h>
 #include <rz_reg.h>
 #include <rz_lib.h>
 #include <rz_analysis.h>

librz/egg/meson.build

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

librz/io/meson.build

@@ -58,11 +58,11 @@ rz_io_deps = [
   zip_dep,
   ar_dep,
   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,
+  rz_socket_dep,
+  rz_hash_dep,
+  rz_crypto_dep,
+  rz_cons_dep,
 ]
 
 if host_machine.system() == 'windows'

librz/main/meson.build

@@ -14,28 +14,26 @@ rz_main_sources = [
 ]
 
 rz_main_deps = [
-  rz_config_dep,
-  rz_cons_dep,
-  rz_io_dep,
   rz_util_dep,
-  rz_flag_dep,
-  rz_asm_dep,
-  rz_core_dep,
-  rz_debug_dep,
-  rz_hash_dep,
-  rz_bin_dep,
-  rz_lang_dep,
-  rz_io_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
+  rz_socket_dep,
+  rz_flag_dep,
+  rz_cons_dep,
+  rz_hash_dep,
+  rz_crypto_dep,
+  rz_io_dep,
+  rz_reg_dep,
+  rz_bp_dep,
+  rz_syscall_dep,
+  rz_parse_dep,
+  rz_asm_dep,
+  rz_egg_dep,
+  rz_search_dep,
+  rz_analysis_dep,
+  rz_debug_dep,
+  rz_config_dep,
+  rz_bin_dep,
+  rz_core_dep,
 ]
 
 rz_main = library('rz_main', rz_main_sources,

librz/parse/meson.build

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

librz/syscall/meson.build

@@ -6,9 +6,7 @@ rz_syscall_sources = [
 rz_syscall = library('rz_syscall', rz_syscall_sources,
   include_directories: [platform_inc],
   c_args: library_cflags,
-  dependencies: [
-    rz_util_dep
-  ],
+  dependencies: [rz_util_dep],
   install: true,
   implicit_include_directories: false,
   install_rpath: rpath_lib,

shlr/meson.build

@@ -284,7 +284,7 @@ qnx_files = [
 qnx_inc = [platform_inc, include_directories('qnx/include')]
 
 librzqnx = static_library('rzqnx', qnx_files,
-  dependencies: [rz_socket_dep, rz_util_dep],
+  dependencies: [rz_util_dep, rz_socket_dep],
   include_directories: qnx_inc,
   implicit_include_directories: false
 )
@@ -458,7 +458,7 @@ winkd_files = [
 winkd_inc = [platform_inc, include_directories('winkd')]
 
 librzwinkd = static_library('rzwinkd', winkd_files,
-  dependencies: [rz_crypto_dep, rz_hash_dep, rz_socket_dep, rz_util_dep],
+  dependencies: [rz_util_dep, rz_socket_dep, rz_hash_dep, rz_crypto_dep],
   include_directories: winkd_inc,
   implicit_include_directories: false
 )