More makefile simplifications (-56LOC)

TODO

@@ -5,13 +5,12 @@
 
 ------8<-------------------8<--------------------8<-----------------8<----------
 
-0.9.2
-- 'Vdu' only undefines a basic block. not the whole function!
-  - it does not unflags the address if loc. 
-- search for CALL instructions in text segment.
-  - analyze the destination address of each call destination
 
 ====[[ 0.9.4 ]]====
+* 'Vdu' only undefines a basic block. not the whole function!
+  - it does not unflags the address if loc. 
+* search for CALL instructions in text segment.
+  - analyze the destination address of each call destination
 * Integrate dwarf parser with disassembler and debugger
 * Analysis: assume there's a function at the end of each function
 * Event system . allow to send and read queues of messages.. thats pubsub!

libr/cmd/TODO

@@ -1,4 +1,3 @@
-* remove alloca() !!!
 * Use RList
 * Support callback for null command (why?)
 * Show help of commands

libr/io/Makefile

@@ -1,47 +1,16 @@
-include ../../global.mk
+include ../config.mk
 
 NAME=r_io
 DEPS=r_lib r_util r_socket r_cons
-
-CFLAGS+=-Wall -DCORELIB
-# on solaris only
-ifeq (${OSTYPE},solaris)
-LDFLAGS+=-lsocket
-endif
-# windows
-ifeq (${OSTYPE},windows)
-LDFLAGS+=-lws2_32
-endif
-
-# copypasted from socket/Makefile
-# on solaris only
-ifeq (${OSTYPE},solaris)
-LDFLAGS+=-lsocket
-endif
-# windows
-ifeq (${OSTYPE},windows)
-LDFLAGS+=-lwsock32
-endif
-
-STATIC_OBJS=
-include $(TOP)/libr/config.mk
-
-foo:
-	for a in pre libr_io.${EXT_SO} libr_io.${EXT_AR} tests plugins ; do ${MAKE} $$a ; done
-
-include ${STATIC_IO_PLUGINS}
 STATIC_OBJS=$(subst ..,p/..,$(subst io_,p/io_,$(STATIC_OBJ)))
 OBJS=${STATIC_OBJS} io.o plugin.o map.o section.o desc.o cache.o undo.o
 
-pre:
-	${MAKE} libr_io.${EXT_SO}
-	@#if [ ! -e libr_io.${EXT_SO} ]; then rm -f ${STATIC_OBJS} ; fi
+CFLAGS+=-Wall -DCORELIB
 
-tests:
-	cd t && ${MAKE} all
-
-plugins:
-	cd p && ${MAKE} all
+include ../socket/deps.mk
 
+all: libr_io.${EXT_SO} libr_io.${EXT_AR}
+	${MAKE} -C p
 
+include ${STATIC_IO_PLUGINS}
 include $(TOP)/libr/rules.mk

libr/socket/Makefile

@@ -1,30 +1,7 @@
 include ../config.mk
 
 NAME=r_socket
-#DEPS=r_util
 OBJS=socket.o proc.o http.o http_server.o
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
-
-# OSX 10.7 (lion)
-ifeq (${OSTYPE},darwin)
-LDFLAGS+=-lcrypto
-endif
-# on solaris only
-ifeq (${OSTYPE},solaris)
-LDFLAGS+=-lsocket
-endif
-ifeq (${OSTYPE},qnx)
-LDFLAGS+=-lsocket
-endif
-# windows
-ifeq (${OSTYPE},windows)
-LDFLAGS=-lwsock32
-endif
 
+include deps.mk
 include ../rules.mk
-
-test:
-	gcc -DMAIN -g -ggdb *.c -I ../include/ `pkg-config openssl --libs` -lr_util

libr/socket/deps.mk

@@ -0,0 +1,22 @@
+ifeq (${HAVE_LIB_SSL},1)
+CFLAGS+=${SSL_CFLAGS}
+LDFLAGS+=${SSL_LDFLAGS}
+endif
+
+# OSX 10.7 (lion)
+ifeq (${OSTYPE},darwin)
+LDFLAGS+=-lcrypto
+endif
+# on solaris only
+ifeq (${OSTYPE},solaris)
+LDFLAGS+=-lsocket
+endif
+ifeq (${OSTYPE},qnx)
+LDFLAGS+=-lsocket
+endif
+# windows
+ifeq (${OSTYPE},windows)
+LDFLAGS=-lwsock32
+#LDFLAGS+=-lws2_32
+endif
+

libr/syscall/Makefile

@@ -4,17 +4,17 @@ NAME=r_syscall
 DEPS=r_util r_db
 
 OBJS=syscall.o ioports.o
-CFLAGS+=-DLIL_ENDIAN=1 -D__UNIX__ -Wall -g
+CFLAGS+=-DLIL_ENDIAN=1 -D__UNIX__ -Wall
 
 EXTRA_CLEAN=doclean
 EXTRA_TARGETS+=do
 
 include ../rules.mk
 
-.PHONY: do
+.PHONY: do doclean
 
 do:
-	@cd d ; ${MAKE}
+	${MAKE} -C d
 
 doclean:
-	@cd d ; ${MAKE} clean
+	${MAKE} -C d clean