Initial support for the Meson build system

- Integrated with current ACR - Fix some stale fails got removed
2017-05-02 05:05:36 +02:00 · 2017-05-02 05:05:36 +02:00 · fa671b9a16
parent 8c78bfa8c0
commit fa671b9a16
42 changed files with 1309 additions and 18 deletions
--- a/21
+++ b/21
@ -384,6 +384,27 @@ menu nconfig:
 pie:
 	sys/pie.sh ${PREVIOUS_RELEASE}

+build:
+	meson --prefix=${PREFIX} build
+
+meson-config:
+	cp -f plugins.meson.cfg plugins.cfg
+	./configure-plugins
+	$(MAKE) meson
+
+meson: build
+	time ninja -C build
+
+meson-install:
+	cd build && DESTDIR="$(DESTDIR)" ninja install
+
+MESON_FILES=$(shell find build/libr build/binr -type f| grep -v @)
+meson-symstall:
+	for a in $(MESON_FILES) ; do echo cp -f $$a $$(echo $$a|sed -e s,build/,,) ; done
+	$(MAKE) symstall
+
+.PHONY: meson meson-install
+
 include ${MKPLUGINS}

 .PHONY: all clean distclean mrproper install symstall uninstall deinstall strip
--- a/binr/rabin2/meson.build
+++ b/binr/rabin2/meson.build
@ -0,0 +1,8 @@
+
+executable('rabin2', 'rabin2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util, r_cons, r_bin, r_config, r_hash, r_io, r_crypto, r_core],
+  install: true
+)
--- a/binr/radare2/meson.build
+++ b/binr/radare2/meson.build
@ -0,0 +1,7 @@
+executable('radare2', 'radare2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util, r_socket, r_core],
+  install: true
+)
--- a/binr/ragg2/meson.build
+++ b/binr/ragg2/meson.build
@ -0,0 +1,8 @@
+
+executable('ragg2', 'ragg2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util, r_egg, r_bin],
+  install: true
+)
--- a/binr/rahash2/meson.build
+++ b/binr/rahash2/meson.build
@ -0,0 +1,8 @@
+
+executable('rahash2', 'rahash2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util, r_hash, r_io, r_crypto],
+  install: true
+)
--- a/binr/rarun2/meson.build
+++ b/binr/rarun2/meson.build
@ -0,0 +1,7 @@
+executable('rarun2', 'rarun2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util, r_socket],
+  install: true
+)
--- a/binr/rasm2/meson.build
+++ b/binr/rasm2/meson.build
@ -0,0 +1,8 @@
+
+executable('rasm2', 'rasm2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util, r_asm, r_anal],
+  install: true
+)
--- a/binr/rax2/meson.build
+++ b/binr/rax2/meson.build
@ -0,0 +1,8 @@
+
+executable('rax2', 'rax2.c',
+  include_directories: include_directories([
+    '../../libr/include'
+  ]),
+  link_with: [r_util],
+  install: true
+)
--- a/libr/anal/meson.build
+++ b/libr/anal/meson.build
@ -0,0 +1,94 @@
+files=[
+'anal.c',
+'anal_ex.c',
+#'arch/gb/meta_gb_cmt.c',
+'bb.c',
+'cc.c',
+'cond.c',
+'cycles.c',
+'data.c',
+'diff.c',
+'esil.c',
+'esil2reil.c',
+'esil_stats.c',
+'esil_trace.c',
+'fcn.c',
+'fcnstore.c',
+'flirt.c',
+'hint.c',
+'labels.c',
+'meta.c',
+'op.c',
+'p/anal_6502.c',
+#'p/anal_8051.c',
+'p/anal_arc.c',
+'p/anal_arm_cs.c',
+# 'p/anal_arm_gnu.c',
+'p/anal_avr.c',
+'p/anal_bf.c',
+#'p/anal_cr16.c',
+'p/anal_cris.c',
+'p/anal_dalvik.c',
+#'p/anal_ebc.c',
+'p/anal_gb.c',
+#'p/anal_h8300.c',
+'p/anal_i4004.c',
+'p/anal_i8080.c',
+#'p/anal_java.c',
+'p/anal_m68k_cs.c',
+'p/anal_malbolge.c',
+'p/anal_mips_cs.c',
+'p/anal_mips_gnu.c',
+#'p/anal_msp430.c',
+'p/anal_nios2.c',
+'p/anal_null.c',
+'p/anal_pic18c.c',
+'p/anal_ppc_cs.c',
+'p/anal_ppc_gnu.c',
+#'p/anal_propeller.c',
+'p/anal_riscv.c',
+#'p/anal_rsp.c',
+'p/anal_sh.c',
+'p/anal_snes.c',
+'p/anal_sparc_cs.c',
+'p/anal_sparc_gnu.c',
+'p/anal_sysz.c',
+#'p/anal_tms320.c',
+#'p/anal_tms320_c55x_plus.c',
+#'p/anal_tms320c64x.c',
+#'p/anal_v810.c',
+#'p/anal_v850.c',
+'p/anal_vax.c',
+'p/anal_ws.c',
+'p/anal_x86_cs.c',
+#'p/anal_x86_udis.c',
+'p/anal_xap.c',
+'p/anal_xcore_cs.c',
+#'p/anal_xtensa.c',
+'p/anal_z80.c',
+#'p/esil_x86_udis.c',
+'pin.c',
+'ref.c',
+'reflines.c',
+'sign.c',
+'state.c',
+'switch.c',
+'test.c',
+'types.c',
+'value.c',
+'var.c',
+'xrefs.c',
+]
+
+r_anal = shared_library('r_anal', files,
+  include_directories: include_directories(['../include', '../asm/arch/8051',
+    '../asm/arch/cr16',
+    '../asm/arch/include/',
+    'arch/gb',
+    '../../shlr/capstone/include',
+    '../../shlr'
+  ]),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_reg, r_syscall, r_search, r_cons, capstone],
+  install: true
+)
--- a/libr/asm/meson.build
+++ b/libr/asm/meson.build
@ -0,0 +1,227 @@
+spp_files=[
+  '../../shlr/spp/spp.c'
+]
+
+spp = static_library('spp', spp_files,
+  include_directories: include_directories([
+    '../../shlr/spp/'
+  ]))
+
+cs_files=[
+'../../shlr/capstone//arch/AArch64/AArch64BaseInfo.c',
+'../../shlr/capstone//arch/AArch64/AArch64Disassembler.c',
+'../../shlr/capstone//arch/AArch64/AArch64InstPrinter.c',
+'../../shlr/capstone//arch/AArch64/AArch64Mapping.c',
+'../../shlr/capstone//arch/AArch64/AArch64Module.c',
+'../../shlr/capstone//arch/ARM/ARMDisassembler.c',
+'../../shlr/capstone//arch/ARM/ARMInstPrinter.c',
+'../../shlr/capstone//arch/ARM/ARMMapping.c',
+'../../shlr/capstone//arch/ARM/ARMModule.c',
+'../../shlr/capstone//arch/M68K/M68KDisassembler.c',
+'../../shlr/capstone//arch/M68K/M68KInstPrinter.c',
+'../../shlr/capstone//arch/M68K/M68KModule.c',
+'../../shlr/capstone//arch/Mips/MipsDisassembler.c',
+'../../shlr/capstone//arch/Mips/MipsInstPrinter.c',
+'../../shlr/capstone//arch/Mips/MipsMapping.c',
+'../../shlr/capstone//arch/Mips/MipsModule.c',
+'../../shlr/capstone//arch/PowerPC/PPCDisassembler.c',
+'../../shlr/capstone//arch/PowerPC/PPCInstPrinter.c',
+'../../shlr/capstone//arch/PowerPC/PPCMapping.c',
+'../../shlr/capstone//arch/PowerPC/PPCModule.c',
+'../../shlr/capstone//arch/Sparc/SparcDisassembler.c',
+'../../shlr/capstone//arch/Sparc/SparcInstPrinter.c',
+'../../shlr/capstone//arch/Sparc/SparcMapping.c',
+'../../shlr/capstone//arch/Sparc/SparcModule.c',
+'../../shlr/capstone//arch/SystemZ/SystemZDisassembler.c',
+'../../shlr/capstone//arch/SystemZ/SystemZInstPrinter.c',
+'../../shlr/capstone//arch/SystemZ/SystemZMapping.c',
+'../../shlr/capstone//arch/SystemZ/SystemZMCTargetDesc.c',
+'../../shlr/capstone//arch/SystemZ/SystemZModule.c',
+'../../shlr/capstone//arch/TMS320C64x/TMS320C64xDisassembler.c',
+'../../shlr/capstone//arch/TMS320C64x/TMS320C64xInstPrinter.c',
+'../../shlr/capstone//arch/TMS320C64x/TMS320C64xMapping.c',
+'../../shlr/capstone//arch/TMS320C64x/TMS320C64xModule.c',
+'../../shlr/capstone//arch/X86/X86ATTInstPrinter.c',
+'../../shlr/capstone//arch/X86/X86Disassembler.c',
+'../../shlr/capstone//arch/X86/X86DisassemblerDecoder.c',
+'../../shlr/capstone//arch/X86/X86IntelInstPrinter.c',
+'../../shlr/capstone//arch/X86/X86Mapping.c',
+'../../shlr/capstone//arch/X86/X86Module.c',
+'../../shlr/capstone//arch/XCore/XCoreDisassembler.c',
+'../../shlr/capstone//arch/XCore/XCoreInstPrinter.c',
+'../../shlr/capstone//arch/XCore/XCoreMapping.c',
+'../../shlr/capstone//arch/XCore/XCoreModule.c',
+'../../shlr/capstone//cs.c',
+'../../shlr/capstone//MCInst.c',
+'../../shlr/capstone//MCInstrDesc.c',
+'../../shlr/capstone//MCRegisterInfo.c',
+'../../shlr/capstone//SStream.c',
+'../../shlr/capstone//utils.c',
+]
+
+capstone = static_library('capstone', cs_files,
+  include_directories: include_directories([
+    '../../shlr/capstone/include'
+  ]))
+
+files=[
+'asm.c',
+'code.c',
+'p/asm_6502.c',
+'p/asm_8051.c',
+'p/asm_arc.c',
+'p/asm_arm_as.c',
+'p/asm_arm_cs.c',
+#'p/asm_arm_gnu.c',
+'p/asm_arm_winedbg.c',
+'p/asm_avr.c',
+'p/asm_bf.c',
+'p/asm_cr16.c',
+'p/asm_cris_gnu.c',
+'p/asm_dalvik.c',
+'p/asm_dcpu16.c',
+'p/asm_ebc.c',
+'p/asm_gas.c',
+'p/asm_gb.c',
+'p/asm_h8300.c',
+'p/asm_hppa_gnu.c',
+'p/asm_i4004.c',
+'p/asm_i8080.c',
+#'p/asm_java.c',
+'p/asm_lanai_gnu.c',
+#'p/asm_lh5801.c',
+'p/asm_lm32.c',
+'p/asm_m68k_cs.c',
+'p/asm_malbolge.c',
+'p/asm_mcs96.c',
+'p/asm_mips_cs.c',
+'p/asm_mips_gnu.c',
+'p/asm_msp430.c',
+'p/asm_nios2.c',
+'p/asm_pic18c.c',
+'p/asm_ppc_cs.c',
+'p/asm_ppc_gnu.c',
+#'p/asm_propeller.c',
+'p/asm_riscv.c',
+'p/asm_rsp.c',
+'p/asm_sh.c',
+'p/asm_snes.c',
+'p/asm_sparc_cs.c',
+'p/asm_sparc_gnu.c',
+'p/asm_spc700.c',
+'p/asm_sysz.c',
+#'p/asm_tms320.c',
+#'p/asm_tms320c64x.c',
+'p/asm_tricore.c',
+#'p/asm_v810.c',
+'p/asm_v850.c',
+'p/asm_vax.c',
+'p/asm_wasm.c',
+'p/asm_ws.c',
+'p/asm_x86_as.c',
+'p/asm_x86_cs.c',
+'p/asm_x86_nasm.c',
+'p/asm_x86_nz.c',
+#'p/asm_x86_udis.c',
+'p/asm_xap.c',
+'p/asm_xcore_cs.c',
+'p/asm_xtensa.c',
+'p/asm_z80.c',
+'arch//6502/6502dis.c',
+'arch//8051/8051.c',
+'arch//arc/gnu/arc-dis.c',
+'arch//arc/gnu/arc-ext.c',
+'arch//arc/gnu/arc-opc.c',
+'arch//arc/gnu/arcompact-dis.c',
+'arch//arm/aarch64/aarch64-dis-2.c',
+'arch//arm/aarch64/aarch64-dis.c',
+'arch//arm/aarch64/aarch64-opc-2.c',
+'arch//arm/aarch64/aarch64-opc.c',
+'arch//arm/armass.c',
+'arch//arm/armass64.c',
+'arch//arm/gnu/arm-dis.c',
+'arch//arm/gnu/floatformat.c',
+'arch//arm/winedbg/be_arm.c',
+#'arch//avr/avr_disasm.c',
+#'arch//avr/avr_instructionset.c',
+'arch//avr/disasm.c',
+#'arch//avr/format.c',
+'arch//cr16/cr16_disas.c',
+'arch//cris/gnu/cris-dis.c',
+'arch//cris/gnu/cris-opc.c',
+#'arch//dcpu16/asm.c',
+#'arch//dcpu16/dis.c',
+#'arch//dcpu16/main.c',
+'arch//ebc/ebc_disas.c',
+'arch//gb/gbasm.c',
+'arch//gb/gbdis.c',
+'arch//h8300/h8300_disas.c',
+'arch//hppa/gnu/hppa-dis.c',
+'arch//i4004/i4004dis.c',
+'arch//i8080/i8080dis.c',
+'arch//lanai/gnu/lanai-dis.c',
+'arch//lanai/gnu/lanai-opc.c',
+#'arch//lh5801/lh5801.c',
+'arch//mips/gnu/mips-dis.c',
+'arch//mips/gnu/mips-opc.c',
+'arch//mips/gnu/mips16-opc.c',
+'arch//mips/mipsasm.c',
+'arch//msp430/msp430_disas.c',
+'arch//nios/gnu/nios2-dis.c',
+'arch//nios/gnu/nios2-opc.c',
+'arch//ppc/gnu/ppc-dis.c',
+'arch//ppc/gnu/ppc-opc.c',
+'arch//propeller/propeller_disas.c',
+#'arch//riscv/riscv-opc.c',
+#'arch//riscv/riscv.c',
+'arch//rsp/rsp_idec.c',
+'arch//sh/gnu/sh-dis.c',
+'arch//snes/snesdis.c',
+'arch//sparc/gnu/sparc-dis.c',
+'arch//sparc/gnu/sparc-opc.c',
+'arch//spc700/spc700dis.c',
+'arch//tms320/c55x_plus/c55plus.c',
+'arch//tms320/c55x_plus/c55plus_decode.c',
+'arch//tms320/c55x_plus/decode_funcs.c',
+'arch//tms320/c55x_plus/hashtable.c',
+'arch//tms320/c55x_plus/hashvector.c',
+'arch//tms320/c55x_plus/ins.c',
+'arch//tms320/c55x_plus/utils.c',
+'arch//tms320/tms320_dasm.c',
+'arch//tricore/gnu/cpu-tricore.c',
+'arch//tricore/gnu/tricore-dis.c',
+'arch//tricore/gnu/tricore-opc.c',
+'arch//v810/v810_disas.c',
+'arch//v850/v850_disas.c',
+'arch//vax/vax-dis.c',
+'arch//whitespace/wsdis.c',
+'arch//xap/dis.c',
+'arch//xtensa/gnu/elf32-xtensa.c',
+'arch//xtensa/gnu/xtensa-dis.c',
+'arch//xtensa/gnu/xtensa-isa.c',
+'arch//xtensa/gnu/xtensa-modules.c',
+#'arch//z80/expressions.c',
+#'arch//z80/z80.c',
+#'arch//z80/z80asm.c',
+]
+
+r_asm = shared_library('r_asm', files,
+  include_directories: include_directories([
+    'arch/include',
+    '../include',
+    '../../shlr/capstone/include',
+    '../../shlr',
+    'arch',
+    'arch/h8300',
+    'arch/msp430',
+    'arch/rsp',
+    'arch/v850',
+    'arch/propeller',
+    'arch/ebc',
+    'arch/cr16',
+    'arch/8051'
+  ]),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_syscall, r_parse, r_lang, capstone, spp],
+  install: true
+)
--- a/libr/asm/p/asm_z80.c
+++ b/libr/asm/p/asm_z80.c
@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2012-2013 - pancake */
+/* radare - LGPL - Copyright 2012-2017 - pancake */

 #include <r_types.h>
 #include <r_util.h>
@ -28,7 +28,7 @@ RAsmPlugin r_asm_plugin_z80 = {
 };

 #ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
+RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_ASM,
 	.data = &r_asm_plugin_z80,
 	.version = R2_VERSION
--- a/libr/bin/meson.build
+++ b/libr/bin/meson.build
@ -0,0 +1,112 @@
+files=[
+'bin.c',
+'bin_write.c',
+'dbginfo.c',
+'demangle.c',
+'dwarf.c',
+'filter.c',
+'p/bin_any.c',
+'p/bin_art.c',
+'p/bin_avr.c',
+'p/bin_bf.c',
+'p/bin_bflt.c',
+'p/bin_bios.c',
+'p/bin_bootimg.c',
+'p/bin_cgc.c',
+'p/bin_coff.c',
+'p/bin_dbginfo_dex.c',
+'p/bin_dbginfo_elf.c',
+'p/bin_dbginfo_elf64.c',
+'p/bin_dex.c',
+'p/bin_dol.c',
+'p/bin_dyldcache.c',
+'p/bin_elf.c',
+'p/bin_elf64.c',
+'p/bin_fs.c',
+#'p/bin_java.c',
+'p/bin_mach0.c',
+'p/bin_mach064.c',
+'p/bin_mbn.c',
+'p/bin_menuet.c',
+'p/bin_mz.c',
+'p/bin_nes.c',
+'p/bin_nin3ds.c',
+'p/bin_ninds.c',
+'p/bin_ningb.c',
+'p/bin_ningba.c',
+'p/bin_nro.c',
+'p/bin_omf.c',
+'p/bin_p9.c',
+'p/bin_pe.c',
+'p/bin_pe64.c',
+'p/bin_pebble.c',
+'p/bin_psxexe.c',
+'p/bin_sfc.c',
+'p/bin_smd.c',
+'p/bin_sms.c',
+'p/bin_spc700.c',
+'p/bin_te.c',
+'p/bin_vsf.c',
+'p/bin_wasm.c',
+'p/bin_write_elf.c',
+'p/bin_write_elf64.c',
+'p/bin_write_mach0.c',
+'p/bin_write_mach064.c',
+'p/bin_write_pe.c',
+'p/bin_write_pe64.c',
+'p/bin_xbe.c',
+'p/bin_xtr_dyldcache.c',
+'p/bin_xtr_fatmach0.c',
+'p/bin_zimg.c',
+
+'format/bflt/bflt.c',
+'format/coff/coff.c',
+'format/dex/dex.c',
+'format/elf/elf.c',
+'format/elf/elf64.c',
+'format/elf/elf64_write.c',
+'format/elf/elf_write.c',
+'format/mach0/dyldcache.c',
+'format/mach0/fatmach0.c',
+'format/mach0/mach0.c',
+'format/mach0/mach064.c',
+'format/mz/mz.c',
+'format/objc/mach064_classes.c',
+'format/objc/mach0_classes.c',
+'format/omf/omf.c',
+'format/p9/p9bin.c',
+'format/pe/pe.c',
+'format/pe/pe64.c',
+'format/pe/pe64_write.c',
+'format/pe/pe_write.c',
+'format/te/te.c',
+'format/wasm/wasm.c',
+'format/zimg/zimg.c',
+
+'mangling/cxx.c',
+'mangling/cxx/cp-demangle.c',
+'mangling/demangler.c',
+'mangling/dlang.c',
+'mangling/microsoft_demangle.c',
+'mangling/msvc.c',
+'mangling/objc.c',
+'mangling/swift-sd.c',
+'mangling/swift.c',
+
+'pdb/dbi.c',
+'pdb/fpo.c',
+'pdb/gdata.c',
+'pdb/omap.c',
+'pdb/pdb.c',
+'pdb/pdb_downloader.c',
+'pdb/stream_file.c',
+'pdb/stream_pe.c',
+'pdb/tpi.c'
+]
+
+r_bin = shared_library('r_bin', files,
+  include_directories: include_directories(['../include','mangling', 'format']),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_io, r_socket, r_magic],
+  install: true
+)
--- a/libr/bp/meson.build
+++ b/libr/bp/meson.build
@ -0,0 +1,20 @@
+files=[
+'bp.c',
+'bp_io.c',
+'bp_plugin.c',
+'bp_traptrace.c',
+'bp_watch.c',
+'p/bp_arm.c',
+'p/bp_bf.c',
+'p/bp_mips.c',
+'p/bp_ppc.c',
+'p/bp_sh.c',
+'p/bp_x86.c'
+]
+
+r_bp = shared_library('r_bp', files,
+  include_directories: include_directories(['../include']),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util],
+  install: true
+)
--- a/libr/config/config.c
+++ b/libr/config/config.c
@ -52,7 +52,7 @@ static void config_print_value_json(RConfig *cfg, RConfigNode *node) {
 	if (!val) {
 		val = "0";
 	}
-	const char *sval = r_str_escape (val);
+	char *sval = r_str_escape (val);
 	if (node->flags & CN_BOOL || node->flags & CN_INT || node->flags & CN_OFFT) {
 		if (!strncmp (val, "0x", 2)) {
 			ut64 n = r_num_get (NULL, val);
--- a/libr/config/meson.build
+++ b/libr/config/meson.build
@ -0,0 +1,10 @@
+files=[
+'callback.c',
+'config.c',
+]
+
+r_config = shared_library('r_config', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
--- a/libr/cons/meson.build
+++ b/libr/cons/meson.build
@ -0,0 +1,26 @@
+
+files=[
+'2048.c',
+'canvas.c',
+'canvas_line.c',
+'cons.c',
+# 'dietline.c',
+'editor.c',
+'grep.c',
+'hud.c',
+'input.c',
+'less.c',
+'line.c',
+'output.c',
+'pal.c',
+'pipe.c',
+'rgb.c',
+'utf8.c'
+]
+
+r_cons = shared_library('r_cons', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
+
--- a/libr/core/meson.build
+++ b/libr/core/meson.build
@ -0,0 +1,67 @@
+files=[
+'anal_tp.c',
+#'anal_vt.c',
+'asm.c',
+'p/core_anal.c',
+'blaze.c',
+'canal.c',
+'cbin.c',
+'cconfig.c',
+'cio.c',
+'cmd.c',
+#'cmd_anal.c',
+'cmd_api.c',
+#'cmd_cmp.c',
+#'cmd_debug.c',
+#'cmd_egg.c',
+#'cmd_eval.c',
+#'cmd_flag.c',
+#'cmd_hash.c',
+#'cmd_help.c',
+#'cmd_info.c',
+#'cmd_log.c',
+'cmd_macro.c',
+'cmd_magic.c',
+#'cmd_meta.c',
+#'cmd_mount.c',
+#'cmd_open.c',
+#'cmd_print.c',
+#'cmd_project.c',
+#'cmd_quit.c',
+#'cmd_search.c',
+#'cmd_search_rop.c',
+#'cmd_section.c',
+#'cmd_seek.c',
+#'cmd_type.c',
+#'cmd_write.c',
+#'cmd_zign.c',
+'core.c',
+'disasm.c',
+'file.c',
+'gdiff.c',
+'graph.c',
+'hack.c',
+'help.c',
+'libs.c',
+#'linux_heap_glibc.c',
+'log.c',
+'panels.c',
+'patch.c',
+'plugin.c',
+'project.c',
+'pseudo.c',
+'rtr.c',
+'task.c',
+'vasm.c',
+'visual.c',
+'vmarks.c',
+'vmenus.c',
+'yank.c'
+]
+
+r_core = shared_library('r_core', files,
+  include_directories: include_directories(['../include','../../shlr']),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin],
+  install: true
+)
--- a/libr/crypto/meson.build
+++ b/libr/crypto/meson.build
@ -0,0 +1,26 @@
+files=[
+'crypto.c',
+'p/crypto_aes.c',
+'p/crypto_aes_algo.c',
+'p/crypto_aes_cbc.c',
+'p/crypto_base64.c',
+'p/crypto_base91.c',
+'p/crypto_blowfish.c',
+'p/crypto_cps2.c',
+'p/crypto_des.c',
+'p/crypto_punycode.c',
+'p/crypto_rc2.c',
+'p/crypto_rc4.c',
+'p/crypto_rc6.c',
+'p/crypto_rol.c',
+'p/crypto_ror.c',
+'p/crypto_rot.c',
+'p/crypto_xor.c',
+]
+
+r_crypto = shared_library('r_crypto', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  c_args : '-DCORELIB=1',
+  install: true
+)
--- a/libr/crypto/p/crypto_blowfish.c
+++ b/libr/crypto/p/crypto_blowfish.c
@ -286,7 +286,7 @@ static bool blowfish_init(struct blowfish_state *const state, const ut8 *key, in
 	return true;
 }

-static struct blowfish_state st = {0};
+static struct blowfish_state st = {{0}};

 static bool blowfish_set_key(RCrypto *cry, const ut8 *key, int keylen, int mode, int direction) {
 	cry->dir = direction;
@ -325,6 +325,7 @@ static bool final(RCrypto *cry, const ut8 *buf, int len) {

 RCryptoPlugin r_crypto_plugin_blowfish = {
 	.name = "blowfish",
+	.license = "LGPL3",
 	.set_key = blowfish_set_key,
 	.get_key_size = blowfish_get_key_size,
 	.use = blowfish_use,
@ -336,8 +337,7 @@ RCryptoPlugin r_crypto_plugin_blowfish = {
 RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_CRYPTO,
 	.data = &r_crypto_plugin_blowfish,
-	.version = R2_VERSION,
-	.license = "LGPL3"
+	.version = R2_VERSION
 };
 #endif

--- a/libr/crypto/p/crypto_punycode.c
+++ b/libr/crypto/p/crypto_punycode.c
@ -50,5 +50,5 @@ RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_CRYPTO,
 	.data = &r_crypto_plugin_punycode,
 	.version = R2_VERSION
-}
+};
 #endif
--- a/libr/debug/meson.build
+++ b/libr/debug/meson.build
@ -0,0 +1,51 @@
+files=[
+'arg.c',
+'ddesc.c',
+'debug.c',
+'dreg.c',
+'esil.c',
+'map.c',
+'p/bfvm.c',
+'p/debug_bf.c',
+#'p/debug_bochs.c',
+'p/debug_esil.c',
+#'p/debug_gdb.c',
+'p/debug_io.c',
+'p/debug_native.c',
+#'p/debug_qnx.c',
+'p/debug_rap.c',
+#'p/debug_wind.c',
+#'p/native/arm.c',
+#'p/native/bt/fuzzy-all.c',
+#'p/native/bt/generic-x64.c',
+#'p/native/bt/generic-x86.c',
+#'p/native/bt.c',
+#'p/native/darwin.c',
+#'p/native/drx.c',
+#'p/native/linux/linux_coredump.c',
+#'p/native/linux/linux_debug.c',
+#'p/native/maps/darwin.c',
+#'p/native/maps/windows.c',
+'p/native/procfs.c',
+#'p/native/reg.c',
+#'p/native/w32.c',
+#'p/native/windows/windows_debug.c',
+#'p/native/xnu/trap_arm.c',
+#'p/native/xnu/trap_x86.c',
+'p/native/xnu/xnu_debug.c',
+#'p/native/xnu/xnu_excthreads.c',
+#'p/native/xnu/xnu_threads.c',
+'pid.c',
+'plugin.c',
+'session.c',
+'signal.c',
+'snap.c',
+'trace.c',
+]
+
+r_debug = shared_library('r_debug', files,
+  include_directories: include_directories(['../include']),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_hash, r_reg, r_syscall, r_anal, r_flag, r_io, r_bp, r_search, r_cons],
+  install: true
+)
--- a/libr/debug/p/native/bt/generic-x86.c
+++ b/libr/debug/p/native/bt/generic-x86.c
@ -4,6 +4,7 @@
 //static RList *backtrace_frames_x86_32_anal(RDebug *dbg, ut64 at);

 /* implementation */
+#include <r_debug.h>

 static RList *backtrace_x86_32(RDebug *dbg, ut64 at) {
 	RRegItem *ri;
--- a/libr/egg/meson.build
+++ b/libr/egg/meson.build
@ -0,0 +1,22 @@
+files=[
+'egg.c',
+'egg_lang.c',
+'emit_arm.c',
+'emit_trace.c',
+'emit_x64.c',
+'emit_x86.c',
+
+#'p/egg_bind.c',
+#'p/egg_cb.c',
+'p/egg_exec.c',
+#'p/egg_reverse.c',
+#'p/egg_shya.c',
+'p/egg_xor.c'
+]
+
+r_egg = shared_library('r_egg', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util, r_asm],
+  install: true
+)
+
--- a/libr/flag/meson.build
+++ b/libr/flag/meson.build
@ -0,0 +1,14 @@
+
+files=[
+'flag.c',
+'sort.c',
+'spaces.c',
+'zones.c'
+]
+
+r_flag = shared_library('r_flag', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
+
--- a/libr/fs/meson.build
+++ b/libr/fs/meson.build
@ -0,0 +1,95 @@
+grub_files=[
+'../../shlr/grub//fs/affs.c',
+#'../../shlr/grub//fs/afs.c',
+#'../../shlr/grub//fs/afs_be.c',
+#'../../shlr/grub//fs/befs.c',
+#'../../shlr/grub//fs/befs_be.c',
+'../../shlr/grub//fs/btrfs.c',
+#'../../shlr/grub//fs/cpio.c',
+'../../shlr/grub//fs/ext2.c',
+'../../shlr/grub//fs/fat.c',
+'../../shlr/grub//fs/fb.c',
+'../../shlr/grub//fs/fshelp.c',
+'../../shlr/grub//fs/hfs.c',
+'../../shlr/grub//fs/hfsplus.c',
+'../../shlr/grub//fs/iso9660.c',
+'../../shlr/grub//fs/jfs.c',
+'../../shlr/grub//fs/minix.c',
+'../../shlr/grub//fs/minix2.c',
+'../../shlr/grub//fs/nilfs2.c',
+'../../shlr/grub//fs/ntfs.c',
+'../../shlr/grub//fs/ntfscomp.c',
+'../../shlr/grub//fs/reiserfs.c',
+'../../shlr/grub//fs/sfs.c',
+'../../shlr/grub//fs/tar.c',
+'../../shlr/grub//fs/udf.c',
+'../../shlr/grub//fs/ufs.c',
+'../../shlr/grub//fs/ufs2.c',
+'../../shlr/grub//fs/xfs.c',
+'../../shlr/grub//grubfs.c',
+'../../shlr/grub//kern/device.c',
+'../../shlr/grub//kern/disk.c',
+#'../../shlr/grub//kern/dl.c',
+'../../shlr/grub//kern/env.c',
+'../../shlr/grub//kern/err.c',
+'../../shlr/grub//kern/file.c',
+'../../shlr/grub//kern/fs.c',
+'../../shlr/grub//kern/list.c',
+'../../shlr/grub//kern/misc.c',
+'../../shlr/grub//kern/mm.c',
+'../../shlr/grub//kern/partition.c',
+'../../shlr/grub//kern/term.c',
+'../../shlr/grub//kern/time.c',
+#'../../shlr/grub//main.c',
+#'../../shlr/grub//partmap/acorn.c',
+'../../shlr/grub//partmap/amiga.c',
+'../../shlr/grub//partmap/apple.c',
+'../../shlr/grub//partmap/bsdlabel.c',
+'../../shlr/grub//partmap/gpt.c',
+'../../shlr/grub//partmap/msdos.c',
+'../../shlr/grub//partmap/sun.c',
+'../../shlr/grub//partmap/sunpc.c',
+]
+grub = static_library('grub', grub_files,
+  include_directories: include_directories([
+    '../../libr/include',
+    '../../shlr/',
+    '../../shlr/grub/include'
+  ])
+)
+
+files=[
+'file.c',
+'fs.c',
+#'p/fs_cpio.c',
+'p/fs_ext2.c',
+'p/fs_fat.c',
+'p/fs_fb.c',
+#'p/fs_grub_base.c',
+'p/fs_hfs.c',
+'p/fs_hfsplus.c',
+'p/fs_iso9660.c',
+'p/fs_jfs.c',
+'p/fs_minix.c',
+'p/fs_ntfs.c',
+'p/fs_posix.c',
+'p/fs_reiserfs.c',
+'p/fs_sfs.c',
+#'p/fs_squash.c',
+'p/fs_tar.c',
+'p/fs_udf.c',
+'p/fs_ufs.c',
+'p/fs_ufs2.c',
+'p/fs_xfs.c',
+'p/part_dos.c'
+]
+
+r_fs = shared_library('r_fs', files,
+  include_directories: include_directories([
+    '../include',
+    '../../shlr/grub/include'
+  ]),
+  link_with: [r_util, grub],
+  install: true
+)
+
--- a/libr/fs/p/fs_posix.c
+++ b/libr/fs/p/fs_posix.c
@ -1,6 +1,7 @@
-/* radare - LGPL - Copyright 2011-2012 - pancake */
+/* radare - LGPL - Copyright 2011-2017 - pancake */

 #include <r_fs.h>
+#include <r_lib.h>
 #include <sys/stat.h>

 static RFSFile* fs_posix_open(RFSRoot *root, const char *path) {
@ -121,7 +122,7 @@ static void fs_posix_umount(RFSRoot *root) {
 	root->ptr = NULL;
 }

-struct r_fs_plugin_t r_fs_plugin_posix = {
+RFSPlugin r_fs_plugin_posix = {
 	.name = "posix",
 	.desc = "POSIX filesystem",
 	.open = fs_posix_open,
@ -133,9 +134,9 @@ struct r_fs_plugin_t r_fs_plugin_posix = {
 };

 #ifndef CORELIB
-struct r_lib_struct_t radare_plugin = {
+RLibStruct radare_plugin = {
        .type = R_LIB_TYPE_FS,
-        .data = &r_asm_plugin_posix,
+        .data = &r_fs_plugin_posix,
        .version = R2_VERSION
 };
 #endif
--- a/libr/fs/p/part_dos.c
+++ b/libr/fs/p/part_dos.c
@ -1,8 +1,10 @@
-/* radare2 - LGPL - Copyright 2015 - pancake */
+/* radare2 - LGPL - Copyright 2015-2017 - pancake */

 /* XXX: maybe this should be implemented in RBin */
 /* we need to extract the code section and get offset flags */

+#include <r_fs.h>
+
 typedef struct {
 	ut8 flag; // 0x80 if active
 	ut8 start_head;
--- a/libr/hash/meson.build
+++ b/libr/hash/meson.build
@ -0,0 +1,23 @@
+
+files=[
+'adler32.c',
+'calc.c',
+'crca.c',
+'entropy.c',
+'hamdist.c',
+'hash.c',
+'luhn.c',
+'md4.c',
+'md5.c',
+'sha1.c',
+'sha2.c',
+'state.c',
+'xxhash.c'
+]
+
+r_hash = shared_library('r_hash', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
+
--- a/libr/include/r_crypto.h
+++ b/libr/include/r_crypto.h
@ -37,6 +37,7 @@ typedef struct r_crypto_t {

 typedef struct r_crypto_plugin_t {
 	const char *name;
+	const char *license;
 	int (*get_key_size)(RCrypto *cry);
 	bool (*set_iv)(RCrypto *cry, const ut8 *iv, int ivlen);
 	bool (*set_key)(RCrypto *cry, const ut8 *key, int keylen, int mode, int direction);
--- a/libr/include/r_util.h
+++ b/libr/include/r_util.h
@ -14,6 +14,7 @@
 #include <dirent.h>
 #endif
 #include <sys/time.h>
+#include "r_util/r_big.h"
 #include "r_util/r_base64.h"
 #include "r_util/r_base91.h"
 #include "r_util/r_buf.h"
--- a/libr/io/meson.build
+++ b/libr/io/meson.build
@ -0,0 +1,46 @@
+files=[
+'buffer.c',
+'cache.c',
+'desc.c',
+'io.c',
+'map.c',
+'plugin.c',
+'section.c',
+'undo.c',
+'p/io_bfdbg.c',
+#'p/io_bochs.c',
+'p/io_debug.c',
+'p/io_default.c',
+#'p/io_gdb.c',
+'p/io_gzip.c',
+'p/io_http.c',
+'p/io_ihex.c',
+'p/io_mach.c',
+'p/io_malloc.c',
+'p/io_mmap.c',
+'p/io_null.c',
+'p/io_procpid.c',
+'p/io_ptrace.c',
+#'p/io_qnx.c',
+'p/io_r2k.c',
+#'p/io_r2k_linux.c',
+#'p/io_r2k_windows.c',
+'p/io_r2pipe.c',
+'p/io_r2web.c',
+'p/io_rap.c',
+'p/io_self.c',
+'p/io_shm.c',
+'p/io_sparse.c',
+'p/io_tcp.c',
+#'p/io_w32.c',
+#'p/io_w32dbg.c',
+#'p/io_windbg.c',
+#'p/io_zip.c',
+]
+
+r_io = shared_library('r_io', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util, r_socket],
+  c_args : '-DCORELIB=1',
+  install: true
+)
--- a/libr/lang/meson.build
+++ b/libr/lang/meson.build
@ -0,0 +1,16 @@
+files=[
+'lang.c',
+'p/c.c',
+'p/cpipe.c',
+'p/lib.c',
+'p/pipe.c',
+'p/rust.c',
+'p/vala.c'
+]
+
+r_lang = shared_library('r_lang', files,
+  include_directories: include_directories(['../include']),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_cons],
+  install: true
+)
--- a/libr/magic/meson.build
+++ b/libr/magic/meson.build
@ -0,0 +1,17 @@
+files=[
+'apprentice.c',
+'ascmagic.c',
+'fsmagic.c',
+'funcs.c',
+'is_tar.c',
+'magic.c',
+# XXX not used? 'print.c',
+'softmagic.c'
+]
+
+r_magic = shared_library('r_magic', files,
+  include_directories: include_directories(['../include']),
+  c_args: ['-DCORELIB','-DHAVE_CONFIG_H','-I.'],
+  link_with: [r_util],
+  install: true
+)
--- a/libr/parse/meson.build
+++ b/libr/parse/meson.build
@ -0,0 +1,32 @@
+files=[
+'code.c',
+'parse.c',
+'p/parse_6502_pseudo.c',
+'p/parse_arm_pseudo.c',
+'p/parse_att2intel.c',
+'p/parse_dalvik_pseudo.c',
+'p/parse_m68k_pseudo.c',
+'p/parse_mips_pseudo.c',
+'p/parse_mreplace.c',
+'p/parse_ppc_pseudo.c',
+'p/parse_x86_pseudo.c',
+'p/parse_z80_pseudo.c',
+'p/parse_mreplace/mreplace.c',
+'p/parse_mreplace/mmemory.c'
+]
+
+tcc = static_library('tcc', [
+'../../shlr/tcc/libtcc.c',
+'../../shlr/tcc/tccgen.c',
+'../../shlr/tcc/tccpp.c'
+],
+include_directories: include_directories(['../include', '../../shlr/tcc']),
+)
+
+r_parse = shared_library('r_parse', files,
+  include_directories: include_directories(['../include', '../../shlr/tcc']),
+  c_args: ['-DCORELIB'],
+  link_with: [r_util, r_flag, r_syscall, r_reg, tcc],
+  install: true
+)
+
--- a/libr/reg/meson.build
+++ b/libr/reg/meson.build
@ -0,0 +1,15 @@
+files=[
+'arena.c',
+'cond.c',
+'double.c',
+'profile.c',
+'reg.c',
+'value.c',
+]
+
+r_reg = shared_library('r_reg', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
+
--- a/libr/search/meson.build
+++ b/libr/search/meson.build
@ -0,0 +1,17 @@
+files=[
+'aes-find.c',
+'bytepat.c',
+'keyword.c',
+# 'old_xrefs.c',
+'regexp.c',
+'rsa-find.c',
+'search.c',
+'strings.c',
+'xrefs.c',
+]
+
+r_search = shared_library('r_search', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
--- a/libr/socket/meson.build
+++ b/libr/socket/meson.build
@ -0,0 +1,16 @@
+files=[
+'http.c',
+'http_server.c',
+'proc.c',
+'r2pipe.c',
+'rap_server.c',
+'run.c',
+'socket.c',
+]
+
+r_socket = shared_library('r_socket', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  c_args : '-DCORELIB=1',
+  install: true
+)
--- a/libr/syscall/meson.build
+++ b/libr/syscall/meson.build
@ -0,0 +1,10 @@
+files=[
+'syscall.c',
+'ioports.c'
+]
+
+r_syscall = shared_library('r_syscall', files,
+  include_directories: include_directories(['../include']),
+  link_with: [r_util],
+  install: true
+)
--- a/libr/util/meson.build
+++ b/libr/util/meson.build
@ -0,0 +1,219 @@
+# project('r_util', 'c')
+
+# 'big-gmp.c',
+# 'big-ssl.c',
+# 'mixed.c',
+# 'iconv.c',
+
+files=[
+'base85.c',
+'base91.c',
+'bdiff.c',
+'big.c',
+'bitmap.c',
+'btree.c',
+'buf.c',
+'cache.c',
+'calc.c',
+'chmod.c',
+'constr.c',
+'debruijn.c',
+'des.c',
+'diff.c',
+'file.c',
+'flist.c',
+'graph.c',
+'hex.c',
+'idpool.c',
+'json_indent.c',
+'judy64na.c',
+'lib.c',
+'list.c',
+'log.c',
+'mem.c',
+'name.c',
+'p_date.c',
+'p_format.c',
+'p_seven.c',
+'pool.c',
+'print.c',
+'prof.c',
+'punycode.c',
+'queue.c',
+'r_asn1.c',
+'r_pkcs7.c',
+'r_x509.c',
+'randomart.c',
+'range.c',
+'sandbox.c',
+'signal.c',
+'slist.c',
+'spaces.c',
+'stack.c',
+'str.c',
+'strbuf.c',
+'strpool.c',
+'sys.c',
+'syscmd.c',
+'thread.c',
+'thread_lock.c',
+'thread_msg.c',
+'thread_pipe.c',
+'tinyrange.c',
+'tree.c',
+'ubase64.c',
+'uleb128.c',
+'unum.c',
+'utf8.c',
+'w32-sys.c',
+'zip.c',
+'regex/regcomp.c',
+'regex/regexec.c',
+'regex/regerror.c'
+]
+
+incdir = include_directories('../include')
+
+sdb_files=[
+'../../shlr/sdb/src/array.c',
+'../../shlr/sdb/src/base64.c',
+'../../shlr/sdb/src/buffer.c',
+'../../shlr/sdb/src/cdb.c',
+'../../shlr/sdb/src/cdb_make.c',
+'../../shlr/sdb/src/disk.c',
+'../../shlr/sdb/src/fmt.c',
+'../../shlr/sdb/src/ht.c',
+'../../shlr/sdb/src/journal.c',
+'../../shlr/sdb/src/json.c',
+'../../shlr/sdb/src/lock.c',
+'../../shlr/sdb/src/ls.c',
+# '../../shlr/sdb/src/main.c',
+'../../shlr/sdb/src/match.c',
+'../../shlr/sdb/src/ns.c',
+'../../shlr/sdb/src/num.c',
+'../../shlr/sdb/src/query.c',
+'../../shlr/sdb/src/sdb.c',
+'../../shlr/sdb/src/sdbht.c',
+'../../shlr/sdb/src/util.c'
+]
+
+zlib_files=[
+'../../shlr/zip//zip/mkstemp.c',
+'../../shlr/zip//zip/zip_add.c',
+'../../shlr/zip//zip/zip_add_dir.c',
+'../../shlr/zip//zip/zip_add_entry.c',
+'../../shlr/zip//zip/zip_close.c',
+'../../shlr/zip//zip/zip_delete.c',
+'../../shlr/zip//zip/zip_dir_add.c',
+'../../shlr/zip//zip/zip_dirent.c',
+'../../shlr/zip//zip/zip_discard.c',
+'../../shlr/zip//zip/zip_entry.c',
+'../../shlr/zip//zip/zip_err_str.c',
+'../../shlr/zip//zip/zip_error.c',
+'../../shlr/zip//zip/zip_error_clear.c',
+'../../shlr/zip//zip/zip_error_get.c',
+'../../shlr/zip//zip/zip_error_get_sys_type.c',
+'../../shlr/zip//zip/zip_error_strerror.c',
+'../../shlr/zip//zip/zip_error_to_str.c',
+'../../shlr/zip//zip/zip_extra_field.c',
+'../../shlr/zip//zip/zip_extra_field_api.c',
+'../../shlr/zip//zip/zip_fclose.c',
+'../../shlr/zip//zip/zip_fdopen.c',
+'../../shlr/zip//zip/zip_file_add.c',
+'../../shlr/zip//zip/zip_file_error_clear.c',
+'../../shlr/zip//zip/zip_file_error_get.c',
+'../../shlr/zip//zip/zip_file_get_comment.c',
+'../../shlr/zip//zip/zip_file_get_offset.c',
+'../../shlr/zip//zip/zip_file_rename.c',
+'../../shlr/zip//zip/zip_file_replace.c',
+'../../shlr/zip//zip/zip_file_set_comment.c',
+'../../shlr/zip//zip/zip_file_strerror.c',
+'../../shlr/zip//zip/zip_filerange_crc.c',
+'../../shlr/zip//zip/zip_fopen.c',
+'../../shlr/zip//zip/zip_fopen_encrypted.c',
+'../../shlr/zip//zip/zip_fopen_index.c',
+'../../shlr/zip//zip/zip_fopen_index_encrypted.c',
+'../../shlr/zip//zip/zip_fread.c',
+'../../shlr/zip//zip/zip_get_archive_comment.c',
+'../../shlr/zip//zip/zip_get_archive_flag.c',
+'../../shlr/zip//zip/zip_get_compression_implementation.c',
+'../../shlr/zip//zip/zip_get_encryption_implementation.c',
+'../../shlr/zip//zip/zip_get_file_comment.c',
+'../../shlr/zip//zip/zip_get_name.c',
+'../../shlr/zip//zip/zip_get_num_entries.c',
+'../../shlr/zip//zip/zip_get_num_files.c',
+'../../shlr/zip//zip/zip_memdup.c',
+'../../shlr/zip//zip/zip_name_locate.c',
+'../../shlr/zip//zip/zip_new.c',
+'../../shlr/zip//zip/zip_open.c',
+'../../shlr/zip//zip/zip_rename.c',
+'../../shlr/zip//zip/zip_replace.c',
+'../../shlr/zip//zip/zip_set_archive_comment.c',
+'../../shlr/zip//zip/zip_set_archive_flag.c',
+'../../shlr/zip//zip/zip_set_default_password.c',
+'../../shlr/zip//zip/zip_set_file_comment.c',
+'../../shlr/zip//zip/zip_set_file_compression.c',
+'../../shlr/zip//zip/zip_set_name.c',
+'../../shlr/zip//zip/zip_source_buffer.c',
+'../../shlr/zip//zip/zip_source_close.c',
+'../../shlr/zip//zip/zip_source_crc.c',
+'../../shlr/zip//zip/zip_source_deflate.c',
+'../../shlr/zip//zip/zip_source_error.c',
+'../../shlr/zip//zip/zip_source_file.c',
+'../../shlr/zip//zip/zip_source_filep.c',
+'../../shlr/zip//zip/zip_source_free.c',
+'../../shlr/zip//zip/zip_source_function.c',
+'../../shlr/zip//zip/zip_source_layered.c',
+'../../shlr/zip//zip/zip_source_open.c',
+'../../shlr/zip//zip/zip_source_pkware.c',
+'../../shlr/zip//zip/zip_source_pop.c',
+'../../shlr/zip//zip/zip_source_read.c',
+'../../shlr/zip//zip/zip_source_stat.c',
+'../../shlr/zip//zip/zip_source_window.c',
+'../../shlr/zip//zip/zip_source_zip.c',
+'../../shlr/zip//zip/zip_source_zip_new.c',
+'../../shlr/zip//zip/zip_stat.c',
+'../../shlr/zip//zip/zip_stat_index.c',
+'../../shlr/zip//zip/zip_stat_init.c',
+'../../shlr/zip//zip/zip_strerror.c',
+'../../shlr/zip//zip/zip_string.c',
+'../../shlr/zip//zip/zip_unchange.c',
+'../../shlr/zip//zip/zip_unchange_all.c',
+'../../shlr/zip//zip/zip_unchange_archive.c',
+'../../shlr/zip//zip/zip_unchange_data.c',
+'../../shlr/zip//zip/zip_utf-8.c',
+'../../shlr/zip//zlib/adler32.c',
+'../../shlr/zip//zlib/compress.c',
+'../../shlr/zip//zlib/crc32.c',
+'../../shlr/zip//zlib/deflate.c',
+'../../shlr/zip//zlib/gzclose.c',
+'../../shlr/zip//zlib/gzlib.c',
+'../../shlr/zip//zlib/gzread.c',
+'../../shlr/zip//zlib/gzwrite.c',
+'../../shlr/zip//zlib/infback.c',
+'../../shlr/zip//zlib/inffast.c',
+'../../shlr/zip//zlib/inflate.c',
+'../../shlr/zip//zlib/inftrees.c',
+'../../shlr/zip//zlib/trees.c',
+'../../shlr/zip//zlib/uncompr.c',
+'../../shlr/zip//zlib/zutil.c'
+]
+
+r_sdb = shared_library('r_sdb', sdb_files,
+  include_directories: include_directories('../../shlr/sdb/src'))
+
+r_zip = static_library('r_zip', zlib_files,
+  include_directories: include_directories([
+    '../../libr/include',
+    '../../shlr/zip/include'
+  ]))
+
+r_util = shared_library('r_util', files,
+  include_directories: incdir,
+  link_with: [r_zip],
+  objects: [
+    r_sdb.extract_all_objects()
+  ],
+  install: true
+)
+
--- a/meson.build
+++ b/meson.build
@ -0,0 +1,41 @@
+project('radare2', 'c')
+
+subdir('libr/util')
+subdir('binr/rax2')
+
+subdir('libr/hash')
+subdir('libr/crypto')
+subdir('libr/socket')
+subdir('libr/io')
+subdir('binr/rahash2')
+subdir('binr/rarun2')
+
+subdir('libr/bp')
+subdir('libr/syscall')
+subdir('libr/cons')
+subdir('libr/search')
+subdir('libr/magic')
+
+subdir('libr/flag')
+subdir('libr/reg')
+
+subdir('libr/bin')
+subdir('libr/config')
+
+subdir('libr/parse')
+subdir('libr/lang')
+
+subdir('libr/asm')
+subdir('libr/anal')
+subdir('binr/rasm2')
+subdir('libr/egg')
+
+subdir('libr/fs')
+
+subdir('libr/debug')
+
+subdir('libr/core')
+
+subdir('binr/rabin2')
+subdir('binr/radare2')
+subdir('binr/ragg2')
--- a/plugins.def.cfg
+++ b/plugins.def.cfg
@ -178,7 +178,6 @@ debug.wind
 debug.bochs
 egg.exec
 egg.xor
-fs.cpio
 fs.ext2
 fs.fat
 fs.fb
--- a/shlr/grub/include/grub/dl.h
+++ b/shlr/grub/include/grub/dl.h
@ -103,7 +103,6 @@ void grub_dl_unload_all (void);
 #else
 #define GRUB_NO_MODULES 0
 #endif
-#if GRUB_NO_MODULES
 static inline int
 grub_dl_ref (grub_dl_t mod)
 {
@ -116,10 +115,6 @@ grub_dl_unref (grub_dl_t mod)
  (void) mod;
  return 0;
 }
-#else
-int grub_dl_ref (grub_dl_t mod);
-int grub_dl_unref (grub_dl_t mod);
-#endif
 void grub_dl_iterate (int (*hook) (grub_dl_t mod));
 grub_dl_t grub_dl_get (const char *name);
 grub_err_t grub_dl_register_symbol (const char *name, void *addr,