Remove shlr/sdb and use the subprojects from make too ##build

* Use sdb 2.0.2 the latest release
radareorg · Nov 29, 2024 · f9139a6 · f9139a6
1 parent 965a5c0
commit f9139a6
Show file tree

Hide file tree

Showing 106 changed files with 63 additions and 15,632 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,14 +70,8 @@ libr/arch/p/arm/v35/arch-armv7
 shlr/capstone/
 shlr/java/out
 shlr/java/out.exe
-shlr/sdb/sdb
-shlr/sdb/sdb.exe
-shlr/sdb/src/sdb
-shlr/sdb/src/.sdb
-shlr/sdb/src/sdb.exe
-shlr/sdb/src/.sdb.exe
-shlr/sdb/src/libsdb.so*
-shlr/spp/config.h
+subprojects/sdb
+subprojects/capstone
 shlr/.cs_tmp.zip
 sys/travis/*.txt
 sys/.mark_python-deps

diff --git a/Makefile b/Makefile
@@ -159,7 +159,7 @@ windist:
 	mkdir -p "${WINDIST}/include/libr/r_util"
 	mkdir -p "${WINDIST}/include/libr/r_anal"
 	@echo "${C}[WINDIST] Copying development files${R}"
-	cp -f shlr/sdb/include/*.h "${WINDIST}/include/libr/sdb/"
+	cp -f subprojects/sdb/include/*.h "${WINDIST}/include/libr/sdb/"
 	cp -f libr/include/r_util/*.h "${WINDIST}/include/libr/r_util/"
 	cp -f libr/include/r_anal/*.h "${WINDIST}/include/libr/r_anal/"
 	cp -f libr/include/*.h "${WINDIST}/include/libr"

diff --git a/binr/rules.mk b/binr/rules.mk
@@ -39,7 +39,7 @@ ifeq (${COMPILER},wasi)
 LINK+=$(SHLR)/zip/librz.a
 LINK+=$(SHLR)/gdb/lib/libgdbr.a
 LINK+=$(SHLR)/capstone/libcapstone.a
-LINK+=$(SHLR)/sdb/src/libsdb.a
+LINK+=$(SHLR)/../subprojects/sdb/src/libsdb.a
 
 # instead of libr.a
 LINK+=$(LIBR)/util/libr_util.a

diff --git a/libr/Makefile b/libr/Makefile
@@ -202,7 +202,7 @@ install-includes:
 		done ; \
 	done)
 	${INSTALL_DIR} "${DESTDIR}${INCLUDEDIR}/libr/sdb"
-	(cd ../shlr/sdb/include/sdb && for FILE in *.h ; do \
+	(cd ../subprojects/sdb/include/sdb && for FILE in *.h ; do \
 		${INSTALL_DATA} $$FILE "${DESTDIR}${INCLUDEDIR}/libr/sdb/$$FILE" ; \
 	done)
 	for a in r_util r_crypto r_anal ; do \
@@ -218,7 +218,7 @@ symstall install-symlink:
 		"${DESTDIR}${LIBDIR}/pkgconfig" \
 		"${DESTDIR}${LIBDIR}/radare2/${VERSION}" ; \
 	rm -rf "${DESTDIR}${INCLUDEDIR}/libr" && ln -fs "${PWD}/include" "${DESTDIR}${INCLUDEDIR}/libr" ; \
-	rm -rf "${DESTDIR}${INCLUDEDIR}/libr/sdb" && ln -fs "${PWD}/../shlr/sdb/include/sdb" "${DESTDIR}${INCLUDEDIR}/libr/sdb" ; \
+	rm -rf "${DESTDIR}${INCLUDEDIR}/libr/sdb" && ln -fs "${PWD}/../subprojects/sdb/include/sdb" "${DESTDIR}${INCLUDEDIR}/libr/sdb" ; \
 	$(MAKE) install-pkgconfig-symlink ; \
 	$(foreach lib,${LIBS}, \
 	  ln -fs "${PWD}/$(lib)/libr_$(lib).${EXT_SO}" \

diff --git a/libr/anal/d/Makefile b/libr/anal/d/Makefile
@@ -78,7 +78,7 @@ HOST_CC?=gcc
 
 F_SDB=$(addsuffix .sdb,$F)
 
-SDBPATH=$(LTOP)/../shlr/sdb/
+SDBPATH=$(LTOP)/../subprojects/sdb/
 ifeq ($(BUILD_OS),windows)
 BUILD_EXT_EXE=.exe
 else

diff --git a/libr/arch/p/java.mk b/libr/arch/p/java.mk
@@ -13,4 +13,4 @@ ${TARGET_JAVA}: ${OBJ_JAVA}
 		-o java.${EXT_SO} \
 		${OBJ_JAVA} ${SHARED2_JAVA} \
 		$(SHLR)/java/libr_java.$(EXT_AR) \
-		$(SHLR)/sdb/src/libsdb.$(EXT_AR)
+		$(SHLR)/../subprojects/sdb/src/libsdb.$(EXT_AR)
diff --git a/libr/asm/Makefile b/libr/asm/Makefile
@@ -3,7 +3,8 @@ include ../../global.mk
 NAME=r_asm
 R2DEPS=r_syscall r_util r_esil r_crypto
 R2DEPS+=r_flag r_cons r_reg r_arch
-CFLAGS+=-DR2_PLUGIN_INCORE -Iarch/include -Iarch -I../../shlr
+CFLAGS+=-DR2_PLUGIN_INCORE -Iarch/include -Iarch
+CFLAGS+=-I../../shlr # for spp only
 CURDIR=p/
 
 include $(TOP)/libr/config.mk
@@ -17,7 +18,7 @@ alle:
 	$(MAKE) gperfs
 	$(MAKE) plugins
 
-SDB_PATH=../../../shlr/sdb
+SDB_PATH=../../../subprojects/sdb
 SDB=$(SDB_PATH)/sdb
 
 gperfs:

diff --git a/libr/asm/d/Makefile b/libr/asm/d/Makefile
@@ -2,7 +2,7 @@ FILES=6502 8051 m68k x86 arc arm avr bpf LH5801 ppc z80 mips sparc sh xtensa
 FILES+=i8080 java i4004 dalvik msp430 lm32 s390 tms320 propeller v810 v850
 FILES+=pic18c chip8 tricore bf pickle riscv evm sm5xx gb stm8
 F_SDB=$(addsuffix .sdb,${FILES})
-SDB=../../../shlr/sdb/sdb
+SDB=../../../subprojects/sdb/sdb
 
 CFLAGS+=-fvisibility=hidden
 LDFLAGS+=-fvisibility=hidden

diff --git a/libr/bin/d/Makefile b/libr/bin/d/Makefile
@@ -1,7 +1,7 @@
 include ../../../global.mk
 include ../../../config-user.mk
 
-SDBPATH=$(LTOP)/../shlr/sdb/
+SDBPATH=$(LTOP)/../subprojects/sdb/
 SDB=$(SDBPATH)/sdb
 
 P=${DESTDIR}${DATADIR}/radare2/${VERSION}/format

diff --git a/libr/bin/p/cgc.mk b/libr/bin/p/cgc.mk
@@ -2,7 +2,6 @@ OBJ_CGC=bin_cgc.o
 
 STATIC_OBJ+=${OBJ_CGC}
 TARGET_CGC=bin_cgc.${EXT_SO}
-#LINK+=-L../../util -lr_util $(SHLR)/sdb/src/libsdb.a
 
 ifeq ($(WITHPIC),1)
 ALL_TARGETS+=${TARGET_CGC}

diff --git a/libr/bin/p/elf.mk b/libr/bin/p/elf.mk
@@ -1,6 +1,5 @@
 OBJ_ELF=bin_elf.o bin_dbginfo_elf.o bin_write_elf.o
 OBJ_ELF+=../format/elf/elf.o ../format/elf/elf_write.o
-#LINK+=-L../../util -lr_util $(SHLR)/sdb/src/libsdb.a
 
 STATIC_OBJ+=${OBJ_ELF}
 TARGET_ELF=bin_elf.${EXT_SO}

diff --git a/libr/bin/p/java.mk b/libr/bin/p/java.mk
@@ -14,4 +14,4 @@ ${TARGET_JAVA}: ${OBJ_JAVA}
 	${CC} $(call libname,bin_java) ${CFLAGS} ${OBJ_JAVA} \
 		$(LINK) $(LDFLAGS) ${SHARED2_JAVA} \
 		${SHLR}/java/libr_java.${EXT_AR} \
-		${SHLR}/sdb/src/libsdb.${EXT_AR}
+		${SHLR}/../subprojects/sdb/src/libsdb.${EXT_AR}
diff --git a/libr/bin/p/mach0.mk b/libr/bin/p/mach0.mk
@@ -9,5 +9,5 @@ ALL_TARGETS+=${TARGET_MACH0}
 
 ${TARGET_MACH0}: ${OBJ_MACH0}
 	-${CC} $(call libname,bin_mach0) ${CFLAGS} \
-		${OBJ_MACH0} ${SHLR}/sdb/src/libsdb.a \
+		${OBJ_MACH0} ${SHLR}/../subprojects/sdb/src/libsdb.a \
 		$(LINK) $(LDFLAGS)
diff --git a/libr/bin/p/mbn.mk b/libr/bin/p/mbn.mk
@@ -2,7 +2,6 @@ OBJ_MBN=bin_mbn.o
 
 STATIC_OBJ+=${OBJ_MBN}
 TARGET_MBN=bin_mbn.${EXT_SO}
-#LINK+=-L../../util -lr_util $(SHLR)/sdb/src/libsdb.a
 
 ifeq ($(WITHPIC),1)
 ALL_TARGETS+=${TARGET_MBN}

diff --git a/libr/bin/p/symbols.mk b/libr/bin/p/symbols.mk
@@ -8,5 +8,5 @@ ALL_TARGETS+=${TARGET_SYMBOLS}
 
 ${TARGET_SYMBOLS}: ${OBJ_SYMBOLS}
 	-${CC} $(call libname,bin_mach0) ${CFLAGS} \
-		${OBJ_SYMBOLS} ${SHLR}/sdb/src/libsdb.a \
+		${OBJ_SYMBOLS} ${SHLR}/../subprojects/sdb/src/libsdb.a \
 		$(LINK) $(LDFLAGS)
diff --git a/libr/bin/p/te.mk b/libr/bin/p/te.mk
@@ -2,7 +2,6 @@ OBJ_TE=bin_te.o ../format/te/te.o
 
 STATIC_OBJ+=${OBJ_TE}
 TARGET_TE=bin_te.${EXT_SO}
-#LINK+=-L../../util -lr_util $(SHLR)/sdb/src/libsdb.a
 
 ALL_TARGETS+=${TARGET_TE}
 

diff --git a/libr/core/p/a2f.mk b/libr/core/p/a2f.mk
@@ -9,7 +9,7 @@ ALL_TARGETS+=${CORE_TARGET_A2F}
 ${CORE_TARGET_A2F}: ${CORE_OBJ_A2F}
 	${CC} $(call libname,core_anal) ${CFLAGS} \
 		-o core_a2f.${EXT_SO} \
-		$(SHLR)/sdb/src/libsdb.a \
+		$(SHLR)/../subprojects/sdb/src/libsdb.a \
 		-L$(LIBR)/crypto -lr_crypto \
 		${CORE_OBJ_A2F}
 endif
diff --git a/libr/core/p/agD.mk b/libr/core/p/agD.mk
@@ -9,7 +9,7 @@ ALL_TARGETS+=${CORE_TARGET_AGD}
 ${CORE_TARGET_AGD}: ${CORE_OBJ_AGD}
 	${CC} $(call libname,core_anal) ${CFLAGS} \
 		-o core_agD.${EXT_SO} \
-		$(SHLR)/sdb/src/libsdb.a \
+		$(SHLR)/../subprojects/sdb/src/libsdb.a \
 		-L$(LIBR)/crypto -lr_crypto \
 		${CORE_OBJ_AGD}
 endif
diff --git a/libr/core/p/java.mk b/libr/core/p/java.mk
@@ -24,6 +24,6 @@ ${CORE_TARGET_JAVA}: ${CORE_OBJ_JAVA}
 		-o core_java.${EXT_SO} \
 		${CORE_OBJ_JAVA} ${CORE_SHARED2_JAVA} \
 		$(SHLR)/java/libr_java.$(EXT_AR) \
-		$(SHLR)/sdb/src/libsdb.$(EXT_AR) \
+		$(SHLR)/../subprojects/sdb/src/libsdb.$(EXT_AR) \
 		-L$(LIBR)/crypto -lr_crypto
 endif
diff --git a/libr/do-ar-sh b/libr/do-ar-sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-LIBS="libr/cons/libr_cons.a libr/util/libr_util.a  libr/bin/libr_bin.a  libr/anal/libr_anal.a libr/bp/libr_bp.a libr/crypto/libr_crypto.a libr/debug/libr_debug.a shlr/sdb/src/libsdb.a libr/core/libr_core.a libr/main/libr_main.a libr/fs/libr_fs.a libr/syscall/libr_syscall.a shlr/java/libr_java.a shlr/zip/librz.a libr/socket/libr_socket.a libr/anal/libr_anal.a libr/flag/libr_flag.a libr/search/libr_search.a libr/reg/libr_reg.a libr/config/libr_config.a libr/io/libr_io.a libr/bp/libr_bp.a libr/asm/libr_asm.a libr/bp/libr_bp.a libr/egg/libr_egg.a libr/anal/libr_anal.a libr/magic/libr_magic.a libr/lang/libr_lang.a libr/fs/libr_fs.a shlr/grub/libgrubfs.a shlr/capstone/libcapstone.a  shlr/gdb/lib/libgdbr.a"
+LIBS="libr/cons/libr_cons.a libr/util/libr_util.a  libr/bin/libr_bin.a  libr/anal/libr_anal.a libr/bp/libr_bp.a libr/crypto/libr_crypto.a libr/debug/libr_debug.a subprojects/sdb/src/libsdb.a libr/core/libr_core.a libr/main/libr_main.a libr/fs/libr_fs.a libr/syscall/libr_syscall.a shlr/java/libr_java.a shlr/zip/librz.a libr/socket/libr_socket.a libr/anal/libr_anal.a libr/flag/libr_flag.a libr/search/libr_search.a libr/reg/libr_reg.a libr/config/libr_config.a libr/io/libr_io.a libr/bp/libr_bp.a libr/asm/libr_asm.a libr/bp/libr_bp.a libr/egg/libr_egg.a libr/anal/libr_anal.a libr/magic/libr_magic.a libr/lang/libr_lang.a libr/fs/libr_fs.a shlr/grub/libgrubfs.a shlr/capstone/libcapstone.a  shlr/gdb/lib/libgdbr.a"
 cd ..
 
 LIB=libr.a

diff --git a/libr/io/p/shm.mk b/libr/io/p/shm.mk
@@ -24,4 +24,4 @@ R_IO_SHM_LINKFLAGS+=-L.. -lr_io
 endif
 
 $(N) p/${TARGET_SHM}: p/${OBJ_SHM}
-	cd p && $(CC) $(CFLAGS) -shared -L.. $(CSRC_SHM) -fPIC -o $(TARGET_SHM) -I../../include -I../../../shlr/sdb/src $(R_IO_SHM_LINKFLAGS)
+	cd p && $(CC) $(CFLAGS) -shared -L.. $(CSRC_SHM) -fPIC -o $(TARGET_SHM) -I../../include -I../../../subprojects/sdb/src $(R_IO_SHM_LINKFLAGS)
diff --git a/libr/main/radare2.c b/libr/main/radare2.c
@@ -125,11 +125,11 @@ static int r_main_version_verify(RCore *core, bool show, bool json) {
 			}
 			{
 				pj_ko (pj, "sdb");
-				pj_ks (pj, "destdir", "shlr/sdb");
+				pj_ks (pj, "destdir", "subprojects/sdb");
 				pj_ks (pj, "git", "https://github.com/radareorg/sdb");
 				pj_ks (pj, "branch", "master");
 				pj_ks (pj, "license", "MIT");
-				pj_ks (pj, "commit", "c4db2b24dacd25403ecb084c9b8e7840889ca236");
+				pj_ks (pj, "commit", "2e24eb0616dfce5e28130660313b56db9252dd5c"); // TODO SUBPROJECTS
 				pj_end (pj);
 			}
 			{

diff --git a/libr/syscall/d/Makefile b/libr/syscall/d/Makefile
@@ -27,7 +27,7 @@ HOST_CC?=gcc
 
 F_SDB=$(addsuffix .sdb,$F)
 
-SDBPATH=$(LTOP)/../shlr/sdb/
+SDBPATH=$(LTOP)/../subprojects/sdb/
 ifeq ($(BUILD_OS),windows)
 BUILD_EXT_EXE=.exe
 else

diff --git a/libr/util/d/Makefile b/libr/util/d/Makefile
@@ -8,7 +8,8 @@ FILES+=macintosh big5 iso_646
 FILES+=cyrillic_iso cyrillic_windows
 
 F_SDB=$(addsuffix .sdb,$(FILES))
-SDB=../../../shlr/sdb/sdb
+# SUBPROJECTS TODO: SDB_EXE
+SDB=../../../subprojects/sdb/sdb
 
 include ../../../config-user.mk
 include ../../../global.mk

diff --git a/libr/util/sdb.mk b/libr/util/sdb.mk
@@ -1,5 +1,6 @@
-SDBPATH=$(SHLR)/sdb/src/
-SDBINCDIR=$(SHLR)/sdb/include
+# SUBPROJECTS TODO sdb
+SDBPATH=$(SHLR)/../subprojects/sdb/src/
+SDBINCDIR=$(SHLR)/../subprojects/sdb/include
 SDBLIB=${SDBPATH}/libsdb.a
 EXTRA_TARGETS+=${SDBLIB}
 EXTRA_PRE+=$(SDBLIB)

diff --git a/shlr/Makefile b/shlr/Makefile
@@ -78,7 +78,6 @@ endif
 SHLR?=$(shell pwd)
 AR?=ar
 RANLIB?=ranlib
-# MODS=sdb zip java mpc
 MODS=zip java mpc
 MODS+=gdb qnx ar
 # lz4
@@ -87,11 +86,8 @@ ifeq (1,$(WITH_GPL))
 MODS+=grub
 endif
 endif
-SDB_URL=https://github.com/radareorg/sdb
-#SDB_URL=/Users/pancake/prg/sdb
 SPP_URL=https://github.com/trufae/spp
 PWD=$(shell pwd)
-SDB_CONFIG=${PWD}/sdb-config.mk
 
 CFLAGS_SHARED=${PIC_CFLAGS}
 
@@ -107,12 +103,6 @@ preall: libwinkd capstone-build bochs sdbs
 		$(MAKE) -C $$MOD HAVE_VALA= ROOT="${PWD}/../" CC="${CC}" ; \
 	done
 
-SDBFILES=sdb/src/.sdb${EXT_EXE} sdb/sdb${EXT_EXE} sdb/src/.sdb sdb/sdb
-PREMODS=capstone gdb winkd sdb bochs ar
-
-clean mrproper:
-	rm -f ${SDBFILES}
-	@for MOD in ${PREMODS} ${MODS} ; do $(MAKE) -C $$MOD clean ; done
 
 ifeq ($(BUILD_OS),windows)
 BUILD_EXT_EXE=.exe
@@ -125,10 +115,18 @@ ifneq ($(CC),cccl)
 PIC=-fPIC
 endif
 
-SDB_HOST=sdb/sdb$(BUILD_EXT_EXE)
-SDB_LIBA=sdb/src/libsdb.$(EXT_AR)
+SDB_ROOT=../subprojects/sdb
+SDB_HOST=$(SDB_ROOT)/sdb$(BUILD_EXT_EXE)
+SDB_LIBA=$(SDB_ROOT)/src/libsdb.$(EXT_AR)
+
+SDBFILES=$(SDB_ROOT)/src/.sdb${EXT_EXE} $(SDB_ROOT)/sdb${EXT_EXE} $(SDB_ROOT)/src/.sdb $(SDB_ROOT)/sdb
+PREMODS=capstone gdb winkd sdb bochs ar
+
+clean mrproper:
+	rm -f ${SDBFILES}
+	@for MOD in ${PREMODS} ${MODS} ; do $(MAKE) -C $$MOD clean ; done
 
-$(SDB_HOST):
+$(SDB_HOST): $(SDB_ROOT)
 	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC)
 
 $(SDB_LIBA):
@@ -137,18 +135,21 @@ $(SDB_LIBA):
 sdbs: $(SDB_HOST)
 	$(MAKE) $(SDB_LIBA) RANLIB="$(RANLIB)"
 
+$(SDB_ROOT):
+	$(MAKE) -C ../subprojects
+
 sdb-host:
 	@echo
 	@echo ">>>>>>>>"
 	@echo "HOST SDB"
 	@echo ">>>>>>>>"
 	@echo
-	$(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/include/sdb/version.h
-	$(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='-I$(SHLR)/sdb/include' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
-	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE}
-	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE)
+	$(MAKE) -C $(SDB_ROOT) clean ; rm -f $(SDB_ROOT)/src/*.o $(SDB_ROOT)/include/sdb/version.h
+	$(MAKE) -C $(SDB_ROOT)/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='-I$(SHLR)/sdb/include' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
+	cp -f $(SDB_ROOT)/src/sdb${BUILD_EXT_EXE} $(SDB_ROOT)/src/.sdb${BUILD_EXT_EXE}
+	cp -f $(SDB_ROOT)/src/sdb${BUILD_EXT_EXE} $(SDB_ROOT)/sdb$(BUILD_EXT_EXE)
 	rm -f $(SDB_LIBA)
-	-file sdb/sdb$(BUILD_EXT_EXE)
+	-file $(SDB_ROOT)/sdb$(BUILD_EXT_EXE)
 
 sdb-target:
 	@echo
@@ -157,18 +158,18 @@ sdb-target:
 	@echo ">>>>>>>>>>"
 	@echo
 	rm -f src/libsdb.$(EXT_AR)
-	$(MAKE) -C sdb clean ; rm -f sdb/src/*.o ../include/sdb/version.h
-	$(MAKE) -C sdb/src ../include/sdb/version.h
+	$(MAKE) -C $(SDB_ROOT) clean ; rm -f $(SDB_ROOT)/src/*.o ../include/sdb/version.h
+	$(MAKE) -C $(SDB_ROOT)/src ../include/sdb/version.h
 ifeq ($(EXT_EXE),.wasm)
-	$(MAKE) -C sdb/src ARCH=xxx EXT_AR=.$(EXT_AR) RANLIB="${RANLIB}" CPPFLAGS=-I$(SHLR)/sdb/include \
+	$(MAKE) -C $(SDB_ROOT)/src ARCH=xxx EXT_AR=.$(EXT_AR) RANLIB="${RANLIB}" CPPFLAGS=-I$(SHLR)/sdb/include \
 		CFLAGS_SHARED="${CFLAGS_SHARED} -DHAVE_MMAN=0" \
 		CC="${CC}" AR="${AR}" ARCH=undefined CFLAGS='${CFLAGS} -DHAVE_MMAN=0' LDFLAGS='${LDFLAGS}' libsdb.$(EXT_AR)
 else
-	$(MAKE) -C sdb/src ARCH=xxx EXT_AR=.$(EXT_AR) RANLIB="${RANLIB}" CPPFLAGS="-I$(SHLR)/sdb/include -DHAVE_SYSTEM=0" \
+	$(MAKE) -C $(SDB_ROOT)/src ARCH=xxx EXT_AR=.$(EXT_AR) RANLIB="${RANLIB}" CPPFLAGS="-I$(SHLR)/sdb/include -DHAVE_SYSTEM=0" \
 		CFLAGS_SHARED="${CFLAGS_SHARED}" \
 		CC="${CC}" AR="${AR}" ARCH=undefined LDFLAGS='${LDFLAGS}' libsdb.$(EXT_AR)
 endif
-	$(RANLIB) sdb/src/libsdb.$(EXT_AR)
+	$(RANLIB) $(SDB_ROOT)/src/libsdb.$(EXT_AR)
 
 .PHONY: sdb-sync sync-sdb sdbclean sdb-native sdb-target
 SDB_F=README.md config.mk src include Makefile meson.build wasi.mk wasi.sh
@@ -185,23 +186,9 @@ bochs:
 	$(MAKE) -C bochs all
 
 sdb-clean clean-sdb:
-	$(MAKE) -C sdb clean
-	rm -f sdb/sdb.exe
-	rm -f sdb/src/libsdb.${EXT_AR}
-
-sdb-sync sync-sdb:
-	rm -rf sdb sdb.vc
-	git clone --depth 1 ${SDB_URL} sdb.vc
-	mkdir -p sdb
-	cp -rf ${SDB_SYNCFILES} sdb
-	rm -rf sdb.vc
-	rm -f include/sdb/version.h
-	$(MAKE) -C sdb include/sdb/version.h
-	mkdir -p sdb/test sdb/memcache
-	sed -e 's,HAVE_VALA=,HAVE_VALA=#,' sdb/config.mk > .t
-	mv .t sdb/config.mk
-	echo all clean mrproper: | tee sdb/test/Makefile > sdb/memcache/Makefile
-	git add sdb
+	$(MAKE) -C $(SDB_ROOT) clean
+	rm -f $(SDB_ROOT)/sdb.exe
+	rm -f $(SDB_ROOT)/src/libsdb.${EXT_AR}
 
 ifeq ($(WITH_LIBR),1)
 install: libr_shlr.${EXT_AR}

diff --git a/shlr/sdb-config.mk b/shlr/sdb-config.mk
diff --git a/shlr/sdb.mk b/shlr/sdb.mk
@@ -1 +1,2 @@
-CFLAGS+=-I$(SHLR)/sdb/include
+# deprecate.. move into subprojects/sdb-deps.mk
+CFLAGS+=-I$(SHLR)/../subprojects/sdb/include