Honor zip configure linkage

binr/blob/Makefile

@@ -5,6 +5,7 @@ BINS=rabin2 rarun2 rasm2 ragg2 rahash2 rax2 rafind2 radiff2
 BINS2=radare2 ${BINS}
 
 include ../../config-user.mk
+include ../../shlr/zip/deps.mk
 
 ifneq (${ANDROID},1)
 ifneq (${OSTYPE},linux)
@@ -49,7 +50,6 @@ LDFLAGS+=../../libr/socket/libr_socket.a
 LDFLAGS+=../../shlr/grub/libgrubfs.a
 LDFLAGS+=../../shlr/capstone/libcapstone.a
 LDFLAGS+=../../shlr/sdb/src/libsdb.a
-LDFLAGS+=../../shlr/zip/librz.a
 LDFLAGS+=../../shlr/gdb/lib/libgdbr.a
 LDFLAGS+=../../shlr/wind/libr_wind.a
 LDFLAGS+=../../shlr/java/libr_java.a

binr/rules.mk

@@ -1,5 +1,6 @@
 BINR_PROGRAM=1
 include ../../libr/config.mk
+include ../../shlr/zip/deps.mk
 
 CFLAGS+=-DLIBDIR=\"${LIBDIR}\" -I$(LTOP)/include
 CFLAGS+=-DR2_BIRTH=\"`date +%Y-%m-%d`\" 
@@ -22,7 +23,6 @@ ifeq ($(WITHNONPIC),1)
 LDFLAGS+=$(shell for a in ${BINDEPS} ; do b=`echo $$a |sed -e s,r_,,g`; echo ../../libr/$$b/lib$$a.a ; done )
 LDFLAGS+=../../shlr/sdb/src/libsdb.a
 LDFLAGS+=../../shlr/grub/libgrubfs.a
-LDFLAGS+=../../shlr/zip/librz.a
 LDFLAGS+=../../shlr/gdb/lib/libgdbr.a
 LDFLAGS+=../../shlr/wind/libr_wind.a
 LDFLAGS+=../../shlr/capstone/libcapstone.a

libr/io/Makefile

@@ -11,16 +11,8 @@ OBJS+=vio.o
 CFLAGS+=-Wall -DCORELIB
 
 include ../socket/deps.mk
-#include ../../shlr/zip/deps.mk
-ifeq ($(USE_LIB_ZIP),1)
-LINK+=$(LIBZIP)
-else
-LINK+=$(SHLR)/zip/librz.a
-endif
-
+include $(SHLR)/zip/deps.mk
 include $(SHLR)/gdb/deps.mk
-#LINK+=$(SHLR)/zip/zlib/*.o
-#LINK+=$(SHLR)/zip/zip/*.o
 
 .PHONY: pre
 pre: libr_io.${EXT_SO} libr_io.${EXT_AR}

libr/util/Makefile

@@ -25,12 +25,7 @@ else
 endif
 endif
 
-ifeq ($(USE_LIB_ZIP),1)
-  LINK+=$(LIBZIP)
-else
-  LINK+=$(SHLR)/zip/librz.a
-endif
-CFLAGS+=-I$(SHLR)/zip/include
+include $(SHLR)/zip/deps.mk
 
 LDFLAGS+=${BN_LIBS}
 LDFLAGS+=${TH_LIBS}

shlr/java/Makefile

@@ -1,7 +1,8 @@
 include ../../config-user.mk
 include ../../mk/${COMPILER}.mk
-include ../../shlr/zip/deps.mk
 SHLR?=$(shell pwd)/..
+include ../../global.mk
+include $(SHLR)/zip/deps.mk
 
 OSTYPE?=$(shell uname | tr 'A-Z' 'a-z')
 ifeq (${OSTYPE},)

shlr/zip/deps.mk

@@ -2,4 +2,5 @@ ifeq ($(USE_LIB_ZIP),1)
 LINK+=$(LIBZIP)
 else
 LINK+=$(STOP)/zip/librz.a
+CFLAGS+=-I$(SHLR)/zip/include
 endif