Fix w32 build

libr/io/Makefile

@@ -1,7 +1,8 @@
-include ../config.mk
+include ../../global.mk
 
 NAME=r_io
 DEPS=r_lib r_util r_socket r_cons
+
 CFLAGS+=-Wall -DCORELIB
 # on solaris only
 ifeq (${OSTYPE},solaris)
@@ -19,12 +20,13 @@ LDFLAGS+=-lsocket
 endif
 # windows
 ifeq (${OSTYPE},windows)
-LDFLAGS=-lwsock32
+LDFLAGS+=-lwsock32
 endif
 
-
 STATIC_OBJS=
-include ../config.mk
+# include ../config.mk
+
+include $(TOP)/libr/rules.mk
 
 foo:
 	for a in pre libr_io.${EXT_SO} libr_io.${EXT_AR} tests plugins ; do ${MAKE} $$a ; done
@@ -43,4 +45,3 @@ tests:
 plugins:
 	cd p && ${MAKE} all
 
-include ../rules.mk

libr/io/p/gdb.mk

@@ -14,7 +14,7 @@ LDFLAGS+=-lsocket
 endif
 # windows
 ifeq (${OSTYPE},windows)
-LDFLAGS=-lwsock32
+LDFLAGS+=-lwsock32
 endif
 ifeq (${WITHPIC},0)
 LINKFLAGS=../../socket/libr_socket.a

libr/rules.mk

@@ -44,8 +44,12 @@ endif
 waitfordeps:
 	@sh $(LIBR)/waitfordeps.sh ${DEPS}
 
+X=$(subst r_,,$(DEPS))
+LDFLAGS+=$(addprefix -L$(TOP)/libr/,$(X))
+LDFLAGS+=$(addprefix -l,$(DEPS))
 ifeq ($(WITHPIC),1)
 ${LIBSO}: $(EXTRA_TARGETS) waitfordeps ${OBJ} ${SHARED_OBJ}
+	echo LDFLAGS=$(LDFLAGS)
 	@for a in ${OBJ} ${SHARED_OBJ} ${SRC}; do \
 	  do=0 ; [ ! -e ${LIBSO} ] && do=1 ; \
 	  test $$a -nt ${LIBSO} && do=1 ; \