Fix #4056 - rename DEPS to R2DEPS ##build (#17020)

* Rename DEPS to R2DEPS * Cleanup of sys/build.sh
radareorg · Jun 12, 2020 · ffe743e · ffe743e
1 parent fab89a6
commit ffe743e
Show file tree

Hide file tree

Showing 32 changed files with 60 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ supported.*
 config.mk
 plugins.cfg
 langs.cfg
+.test.c
 .*.swp
 .*.swo
 *.un~

diff --git a/libr/Makefile b/libr/Makefile
@@ -159,7 +159,7 @@ $(LIBS):
 
 pkgcfg:
 	@for lib in ${LIBS}; do $(MAKE) -C $${lib} pkgcfg; done
-	$(MAKE) -C asm pkgcfg NAME=libr DEPS="r_`echo ${LIBS}|sed -e 's, , r_,g'`"
+	$(MAKE) -C asm pkgcfg NAME=libr R2DEPS="r_`echo ${LIBS}|sed -e 's, , r_,g'`"
 	# TODO: Magically generate libr.pc.acr here using LIBS and so :)
 
 install-pkgconfig:

diff --git a/libr/anal/Makefile b/libr/anal/Makefile
@@ -5,7 +5,7 @@ EXTRA_CLEAN=doclean
 CFLAGS+=-I..
 
 NAME=r_anal
-DEPS=r_util r_reg r_syscall r_search r_cons r_flag r_hash r_crypto r_parse
+R2DEPS=r_util r_reg r_syscall r_search r_cons r_flag r_hash r_crypto r_parse
 CFLAGS+=-DR2_PLUGIN_INCORE -Iarch -I$(TOP)/shlr
 CFLAGS+=-I$(LTOP)/asm/arch/include
 

diff --git a/libr/asm/Makefile b/libr/asm/Makefile
@@ -1,8 +1,8 @@
 include ../../global.mk
 
 NAME=r_asm
-DEPS=r_syscall r_lang r_util r_parse
-DEPS+=r_flag r_cons r_reg
+R2DEPS=r_syscall r_lang r_util r_parse
+R2DEPS+=r_flag r_cons r_reg
 CFLAGS+=-DR2_PLUGIN_INCORE -Iarch/include -Iarch -I../../shlr
 CURDIR=p/
 

diff --git a/libr/bin/Makefile b/libr/bin/Makefile
@@ -2,7 +2,7 @@ include ../config.mk
 include ../../global.mk
 
 NAME=r_bin
-DEPS=r_util r_io r_socket r_magic r_hash r_syscall
+R2DEPS=r_util r_io r_socket r_magic r_hash r_syscall
 
 .PHONY: pre
 

diff --git a/libr/bp/Makefile b/libr/bp/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 NAME=r_bp
-DEPS+=r_util
+R2DEPS+=r_util
 
 CFLAGS+=-DR2_PLUGIN_INCORE
 

diff --git a/libr/config.mk.tail b/libr/config.mk.tail
@@ -25,15 +25,15 @@ CFLAGS+=${CPPFLAGS}
 
 ifeq (1,1)
 #$(WITHPIC),1)
-LINK+=$(subst r_,-L$(LIBR)/,$(DEPS))
-LINK+=$(subst r_,-lr_,$(DEPS))
+LINK+=$(subst r_,-L$(LIBR)/,$(R2DEPS))
+LINK+=$(subst r_,-lr_,$(R2DEPS))
 LINK+=$(subst r_,-L$(LIBR)/,$(BINDEPS))
 LINK+=$(subst r_,-lr_,$(BINDEPS))
 CFLAGS+=${PIC_CFLAGS}
 LINK+=${PIC_CFLAGS}
 else
-ifneq ($(DEPS),)
-LINK+=$(shell echo ${DEPS} | sed -e 's:r_\([^ ]\+\):$(LIBR)/\1/libr_\1.${EXT_AR}:g')
+ifneq ($(R2DEPS),)
+LINK+=$(shell echo ${R2DEPS} | sed -e 's:r_\([^ ]\+\):$(LIBR)/\1/libr_\1.${EXT_AR}:g')
 endif
 endif
 

diff --git a/libr/config/Makefile b/libr/config/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 NAME=r_config
-DEPS=r_util
+R2DEPS=r_util
 OBJS=config.o callback.o hold.o
 
 include ../rules.mk
diff --git a/libr/cons/Makefile b/libr/cons/Makefile
@@ -4,7 +4,7 @@ NAME=r_cons
 OBJS=cons.o pipe.o output.o grep.o less.o more.o pager.o cutf8.o
 OBJS+=line.o hud.o rgb.o input.o pal.o editor.o 2048.o html.o
 OBJS+=canvas.o canvas_line.o stiv.o
-DEPS=r_util
+R2DEPS=r_util
 
 include ../rules.mk
 

diff --git a/libr/core/Makefile b/libr/core/Makefile
@@ -2,9 +2,9 @@ include ../config.mk
 
 NAME=r_core
 
-DEPS=r_config r_cons r_io r_util r_flag r_asm
-DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg
-DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto
+R2DEPS=r_config r_cons r_io r_util r_flag r_asm
+R2DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg
+R2DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto
 
 OBJS=core.o cmd.o cfile.o cconfig.o visual.o cio.o yank.o libs.o agraph.o
 OBJS+=fortune.o hack.o vasm.o patch.o cbin.o corelog.o rtr.o cmd_api.o

diff --git a/libr/core/p/java.mk b/libr/core/p/java.mk
@@ -15,7 +15,7 @@ LDFLAGS+=$(LINK)
 
 ifeq ($(WITHPIC),1)
 ALL_TARGETS+=${CORE_TARGET_JAVA}
-DEPS+=r_crypto
+R2DEPS+=r_crypto
 include $(STOP)/java/deps.mk
 
 ${CORE_TARGET_JAVA}: ${CORE_OBJ_JAVA}

diff --git a/libr/crypto/Makefile b/libr/crypto/Makefile
@@ -1,5 +1,5 @@
 NAME=r_crypto
-DEPS=r_hash r_util
+R2DEPS=r_hash r_util
 CFLAGS+=-DR2_PLUGIN_INCORE
 
 include ../config.mk

diff --git a/libr/crypto/p/aes.mk b/libr/crypto/p/aes.mk
@@ -1,6 +1,6 @@
 OBJ_AES=crypto_aes.o crypto_aes_algo.o
 
-DEPS+=r_util
+R2DEPS+=r_util
 DEPFLAGS=-L../../util -lr_util -L.. -lr_crypto
 
 STATIC_OBJ+=${OBJ_AES}

diff --git a/libr/crypto/p/serpent.mk b/libr/crypto/p/serpent.mk
@@ -1,6 +1,6 @@
 OBJ_SERPENT=crypto_serpent.o crypto_serpent_algo.o
 
-DEPS+=r_util
+R2DEPS+=r_util
 DEPFLAGS=-L../../util -lr_util -L.. -lr_crypto
 
 STATIC_OBJ+=${OBJ_SERPENT}

diff --git a/libr/debug/Makefile b/libr/debug/Makefile
@@ -1,8 +1,8 @@
 include ../config.mk
 
 NAME=r_debug
-DEPS=r_reg r_anal r_bp r_io r_parse r_cons r_syscall r_hash r_flag r_util r_egg
-DEPS+=r_socket
+R2DEPS=r_reg r_anal r_bp r_io r_parse r_cons r_syscall r_hash r_flag r_util r_egg
+R2DEPS+=r_socket
 CFLAGS+=-DR2_PLUGIN_INCORE
 
 ifeq ($(OSTYPE),bsd)

diff --git a/libr/debug/p/bochs.mk b/libr/debug/p/bochs.mk
@@ -22,7 +22,7 @@ LDFLAGS+=-L$(LTOP)/reg -lr_reg
 LDFLAGS+=-L$(LTOP)/bp -lr_bp
 LDFLAGS+=-L$(LTOP)/io -lr_io
 
-OBJ_BOCHS=debug_bochs.o 
+OBJ_BOCHS=debug_bochs.o
 
 STATIC_OBJ+=${OBJ_BOCHS}
 TARGET_BOCHS=debug_bochs.${EXT_SO}

diff --git a/libr/debug/p/qnx.mk b/libr/debug/p/qnx.mk
@@ -24,7 +24,7 @@ LDFLAGS+=-L$(LTOP)/reg -lr_reg
 LDFLAGS+=-L$(LTOP)/bp -lr_bp
 LDFLAGS+=-L$(LTOP)/io -lr_io
 
-OBJ_QNX=debug_qnx.o 
+OBJ_QNX=debug_qnx.o
 
 STATIC_OBJ+=${OBJ_QNX}
 TARGET_QNX=debug_qnx.${EXT_SO}

diff --git a/libr/egg/Makefile b/libr/egg/Makefile
@@ -1,8 +1,8 @@
 include ../config.mk
 
 NAME=r_egg
-DEPS=r_asm r_syscall r_util r_parse r_reg
-DEPS+=r_flag r_cons
+R2DEPS=r_asm r_syscall r_util r_parse r_reg
+R2DEPS+=r_flag r_cons
 
 OBJS=egg.o egg_lang.o
 OBJS+=emit_x86.o

diff --git a/libr/flag/Makefile b/libr/flag/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 NAME=r_flag
-DEPS=r_util
+R2DEPS=r_util
 OBJS=flag.o zones.o tags.o
 
 include ../rules.mk
diff --git a/libr/fs/Makefile b/libr/fs/Makefile
@@ -1,5 +1,5 @@
 NAME=r_fs
-DEPS=r_util r_io
+R2DEPS=r_util r_io
 CFLAGS+=-DR2_PLUGIN_INCORE -Iarch/include -Iarch
 
 SHLR=../../shlr/

diff --git a/libr/hash/Makefile b/libr/hash/Makefile
@@ -10,7 +10,7 @@ LINK=-lm
 endif
 endif
 
-DEPS=r_util
+R2DEPS=r_util
 OBJS=state.o hash.o hamdist.o crca.o fletcher.o
 OBJS+=entropy.o hcalc.o adler32.o luhn.o
 

diff --git a/libr/io/Makefile b/libr/io/Makefile
@@ -1,9 +1,9 @@
 include ../config.mk
 
 NAME=r_io
-DEPS+=r_util
-DEPS+=r_socket
-DEPS+=r_cons
+R2DEPS+=r_util
+R2DEPS+=r_socket
+R2DEPS+=r_cons
 STATIC_OBJS=$(subst ..,p/..,$(subst io_,p/io_,$(STATIC_OBJ)))
 OBJS=${STATIC_OBJS}
 OBJS+=io.o io_plugin.o io_map.o io_desc.o io_cache.o p_cache.o undo.o ioutils.o io_fd.o

diff --git a/libr/lang/Makefile b/libr/lang/Makefile
@@ -2,7 +2,7 @@ include ../config.mk
 
 NAME=r_lang
 OBJS=lang.o
-DEPS=r_util r_cons
+R2DEPS=r_util r_cons
 
 include ../rules.mk
 

diff --git a/libr/magic/Makefile b/libr/magic/Makefile
@@ -2,7 +2,7 @@ include ../../global.mk
 include $(LTOP)/config.mk
 
 NAME=r_magic
-DEPS=r_util
+R2DEPS=r_util
 PCLIBS=@LIBMAGIC@
 CFLAGS+=-I.
 OBJS=apprentice.o ascmagic.o fsmagic.o funcs.o is_tar.o magic.o softmagic.o

diff --git a/libr/main/deps.mk b/libr/main/deps.mk
@@ -1,9 +1,9 @@
 MAIN_LINK_ALL=1
 
 ifeq ($(MAIN_LINK_ALL),1)
-DEPS=r_config r_cons r_io r_util r_flag r_asm r_core
-DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg
-DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto
+R2DEPS=r_config r_cons r_io r_util r_flag r_asm r_core
+R2DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg
+R2DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto
 else
 # only works
 WITH_LIBS=0

diff --git a/libr/parse/Makefile b/libr/parse/Makefile
@@ -1,9 +1,9 @@
 include ../config.mk
 
 NAME=r_parse
-DEPS=r_flag r_util r_syscall r_reg
+R2DEPS=r_flag r_util r_syscall r_reg
 # indirect dependencies
-DEPS+=r_cons
+R2DEPS+=r_cons
 
 LINK+=$(STOP)/tcc/libr_tcc.a
 CFLAGS+=-I$(STOP)/tcc/

diff --git a/libr/reg/Makefile b/libr/reg/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 NAME=r_reg
-DEPS=r_util
+R2DEPS=r_util
 OBJS=reg.o arena.o rvalue.o rcond.o double.o profile.o
 
 include ../rules.mk
diff --git a/libr/rules.mk b/libr/rules.mk
@@ -108,9 +108,9 @@ pkgcfg:
 	@echo 'Name: ${NAME}' >> ../../pkgcfg/${NAME}.pc.acr
 	@echo 'Description: radare foundation libraries' >> ../../pkgcfg/${NAME}.pc.acr
 	@echo 'Version: @VERSION@' >> ../../pkgcfg/${NAME}.pc.acr
-	@echo 'Requires: $(filter r_%,${DEPS})' >> ../../pkgcfg/${NAME}.pc.acr
+	@echo 'Requires: $(filter r_%,${R2DEPS})' >> ../../pkgcfg/${NAME}.pc.acr
 	@if [ "${NAME}" = "libr" ]; then NAME=''; else NAME=${NAME}; fi ;\
-	echo 'Libs: -L$${libdir} -l${NAME} $(filter-out r_%,${DEPS}) ${PCLIBS}' >> ../../pkgcfg/${NAME}.pc.acr
+	echo 'Libs: -L$${libdir} -l${NAME} $(filter-out r_%,${R2DEPS}) ${PCLIBS}' >> ../../pkgcfg/${NAME}.pc.acr
 	@echo 'Cflags: -I$${includedir}/libr ${PCCFLAGS}' >> ../../pkgcfg/${NAME}.pc.acr
 
 clean:: ${EXTRA_CLEAN}

diff --git a/libr/search/Makefile b/libr/search/Makefile
@@ -4,7 +4,7 @@ NAME=r_search
 OBJS=search.o bytepat.o strings.o aes-find.o privkey-find.o
 OBJS+=regexp.o keyword.o
 # OBJ+=rsakey.o
-DEPS=r_util
+R2DEPS=r_util
 CFLAGS+=-g
 
 include ../rules.mk
diff --git a/libr/socket/Makefile b/libr/socket/Makefile
@@ -8,7 +8,7 @@ OBJS+=socket_http_server.o
 OBJS+=socket_rap_server.o
 OBJS+=socket_rap_client.o
 OBJS+=run.o r2pipe.o socket_serial.o
-DEPS=r_util
+R2DEPS=r_util
 
 include deps.mk
 include ../rules.mk
diff --git a/libr/syscall/Makefile b/libr/syscall/Makefile
@@ -1,7 +1,7 @@
 include ../config.mk
 
 NAME=r_syscall
-DEPS=r_util
+R2DEPS=r_util
 
 OBJS=syscall.o ioports.o
 CFLAGS+=-D__UNIX__ -Wall