pancake wrote:
> I can test the building issues in the farm.. So we now have time to break
> things.
>
> The problem is that actually the patches does not apply and some file patches
> got rejected.
Yes, the same happened in my own tree when I left it for a couple of weeks,
somewhere around the sysmagic change. Since then, I've updated every few days
and not had any problems.
> It would be great if you can send me an updated version of the patch and meet
> in the irc to discuss any of the issues if exist.
Attached.
One trivial point - I've seen both kinds of references to Makefile variables,
ie.
${HAVE_LIB_SSL}
and
$(HAVE_LIB_GMP)
Is the choice of ${ vs $( dependent on the variable name, or is it just
whatever was easiest at the time?
diff -r f4b31e422ab0 binr/binr.mk
--- a/binr/binr.mk Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/binr.mk Wed Nov 02 20:41:27 2011 +0000
@@ -1,27 +1,9 @@
-include ../../libr/config.mk
-include ../../config-user.mk
+include ../../libr/rules.mk
.PHONY: all clean
-CFLAGS+=-I../../libr/include
CFLAGS+=-DLIBDIR=\"${LIBDIR}\"
-ifeq ($(WITHPIC),1)
-LIBS=$(subst r_,-lr_,$(BINDEPS))
-LIBS+=$(subst r_,-L../../libr/,$(BINDEPS))
-else
-PFXDLIBS=$(addsuffix .a,${BINDEPS})
-XXXLIBS+=$(subst r_,../../libr/XXX/libr_,$(PFXDLIBS))
-LIBS+=$(shell echo ${XXXLIBS} | sed -e 's,XXX/libr_\([^\. ]*\),\1/libr_\1,g')
-endif
+OBJS+=${BIN}.o
-all: ${BIN}${EXT_EXE}
-
-${BIN}${EXT_EXE}: ${BIN}.o ${OBJS}
- ${CC} -o ${BIN}${EXT_EXE} ${OBJS} ${BIN}.o ${LIBS} ${LDFLAGS}
-
-clean: ${MYCLEAN}
- -rm -f ${BIN} ${BIN}.o ${OBJS}
-
-mrproper: clean
- -rm -f ${BIN}.d
+${BIN}${EXT_EXE}: ${OBJS}
diff -r f4b31e422ab0 binr/rabin2/Makefile
--- a/binr/rabin2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/rabin2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -2,17 +2,3 @@
BINDEPS=r_bin r_cons r_lib r_flags r_util r_db
include ../binr.mk
-
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=${DL_LIBS} -lm
-LDFLAGS+=../../libr/fs/p/grub/libgrubfs.a
-LDFLAGS+=../../libr/db/sdb/src/libsdb.a
-ifeq ($(HAVE_LIB_MAGIC),1)
-LDFLAGS+=-lmagic
-endif
-endif
-
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
diff -r f4b31e422ab0 binr/radare2/Makefile
--- a/binr/radare2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/radare2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,7 +1,7 @@
BIN=radare2
-BINDEPS=r_core r_parse r_search r_cons r_lib r_config r_diff
-BINDEPS+=r_bin r_debug r_anal r_reg r_bp r_io r_cmd r_fs r_db
-BINDEPS+=r_sign r_print r_lang r_asm r_syscall r_hash r_line
+BINDEPS=r_core r_parse r_search r_cons r_lib r_config
+BINDEPS+=r_bin r_debug r_anal r_diff r_reg r_bp r_io r_cmd r_fs
+BINDEPS+=r_sign r_print r_lang r_asm r_syscall r_db r_hash r_line
BINDEPS+=r_magic r_socket r_flags r_util r_th r_egg
include ../binr.mk
@@ -18,23 +18,3 @@
ifeq ($(OSTYPE),android)
LDFLAGS+=${DL_LIBS} -lm
endif
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=${DL_LIBS} -lm
-LDFLAGS+=../../libr/fs/p/grub/libgrubfs.a
-LDFLAGS+=../../libr/db/sdb/src/libsdb.a
-ifeq ($(HAVE_LIB_GMP),1)
-LDFLAGS+=-lgmp
-endif
-endif
-ifeq ($(USE_LIB_MAGIC),1)
-LDFLAGS+=-lmagic
-endif
-
-ifeq ($(uname),OpenBSD)
-LDFLAGS+=-pthread
-endif
-
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
diff -r f4b31e422ab0 binr/radiff2/Makefile
--- a/binr/radiff2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/radiff2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,27 +1,11 @@
BIN=radiff2
BINDEPS=r_core r_diff r_config r_lib r_cons r_search r_anal
-BINDEPS+=r_bin r_debug r_io r_print r_asm r_hash r_util r_fs
+BINDEPS+=r_bin r_debug r_io r_print r_asm r_hash r_fs
BINDEPS+=r_socket r_flags r_lang r_reg r_bp r_cmd r_sign r_parse
-BINDEPS+=r_line r_syscall r_db r_magic r_parse r_egg
+BINDEPS+=r_line r_syscall r_db r_magic r_util r_parse r_egg
include ../binr.mk
ifeq ($(OSTYPE),android)
LDFLAGS+=${DL_LIBS} -lm
endif
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=${DL_LIBS} -lm
-LDFLAGS+=../../libr/fs/p/grub/libgrubfs.a
-LDFLAGS+=../../libr/db/sdb/src/libsdb.a
-ifeq ($(HAVE_LIB_GMP),1)
-LDFLAGS+=-lgmp
-endif
-endif
-ifeq ($(USE_LIB_MAGIC),1)
-LDFLAGS+=-lmagic
-endif
-
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
diff -r f4b31e422ab0 binr/rafind2/Makefile
--- a/binr/rafind2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/rafind2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -3,16 +3,3 @@
BINDEPS+=r_socket r_db r_parse
include ../binr.mk
-
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=${DL_LIBS} -lm
-LDFLAGS+=../../libr/fs/p/grub/libgrubfs.a
-ifeq ($(HAVE_LIB_GMP),1)
-LDFLAGS+=-lgmp
-endif
-
-endif
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
diff -r f4b31e422ab0 binr/ragg2/Makefile
--- a/binr/ragg2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/ragg2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,13 +1,8 @@
BIN=ragg2
-BINDEPS=r_egg r_bin r_syscall r_asm r_util r_db r_parse
+BINDEPS=r_egg r_bin r_syscall r_asm r_db r_util r_parse
include ../binr.mk
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=${DL_LIBS}
-LDFLAGS+=../../libr/db/sdb/src/libsdb.a
-endif
-
t test:
cd t ; ${MAKE}
diff -r f4b31e422ab0 binr/rahash2/Makefile
--- a/binr/rahash2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/rahash2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -3,9 +3,6 @@
include ../binr.mk
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=-lm
-endif
ifeq ($(OSTYPE),android)
LDFLAGS+=-lm
endif
diff -r f4b31e422ab0 binr/ranal2/Makefile
--- a/binr/ranal2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/ranal2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,16 +1,10 @@
BIN=ranal2
-BINDEPS=r_anal r_lib r_reg r_util r_syscall r_diff r_db
+BINDEPS=r_anal r_lib r_reg r_syscall r_diff r_db r_util
include ../binr.mk
ifeq ($(WITHNONPIC),1)
ifeq ($(OSTYPE),android)
LDFLAGS+=${DL_LIBS} -lm
-else
-LDFLAGS+=${DL_LIBS} -lm -lpthread
endif
-LDFLAGS+=../../libr/db/sdb/src/libsdb.a
-ifeq ($(HAVE_LIB_GMP),1)
-LDFLAGS+=-lgmp
endif
-endif
diff -r f4b31e422ab0 binr/rarun2/Makefile
--- a/binr/rarun2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/rarun2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,5 +1,4 @@
BIN=rarun2
BINDEPS=r_util
-OBJ=main.o
include ../binr.mk
diff -r f4b31e422ab0 binr/rasm2/Makefile
--- a/binr/rasm2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/rasm2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -2,7 +2,3 @@
BINDEPS=r_asm r_util r_lib r_parse
include ../binr.mk
-
-ifeq ($(WITHNONPIC),1)
-LDFLAGS+=${DL_LIBS}
-endif
diff -r f4b31e422ab0 binr/rsc2/Makefile
--- a/binr/rsc2/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/binr/rsc2/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,4 +1,4 @@
BIN=rsc2
-DEPS=
+BINDEPS=r_util
include ../binr.mk
diff -r f4b31e422ab0 libr/anal/t/Makefile
--- a/libr/anal/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/anal/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,17 +1,6 @@
-include ../../config.mk
+BINDEPS=r_util
+BIN=test_x86im
+OBJ=test_x86im.o ../arch/x86/x86im/x86im.o
+CFLAGS+=-I ../arch -D__UNIX__=1
-CFLAGS+=-I ../arch -I../../include -D__UNIX__=1
-LDFLAGS=-L../../util -lr_util -L../../anal -lr_anal -L../../reg -lr_reg
-L../../syscall -lr_syscall
-LDFLAGS+=-L../../diff -lr_diff -L../../db -lr_db
-
-all: test_x86im${EXT_EXE}
-
-test_x86im${EXT_EXE}: test_x86im.o ../arch/x86/x86im/x86im.o
- ${CC} ${CFLAGS} ${LDFLAGS} -o test_x86im${EXT_EXE} \
- ../arch/x86/x86im/x86im.o test_x86im.o
-
-clean:
- rm -f test_x86im${EXT_EXE} test_x86im.o
-
-mrproper: clean
- rm -f test_x86im.d
+include ../../rules.mk
diff -r f4b31e422ab0 libr/bin/t/Makefile
--- a/libr/bin/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/bin/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -2,22 +2,9 @@
BINDEPS=r_lib r_bin r_flags r_util r_cons
CFLAGS+=-DLIBDIR=\"${LIBDIR}\"
-LIBS+=${DL_LIBS}
-
-LDPATH=-L.. -L../../util
-LDPATH+=-lr_util
all: test_meta${EXT_EXE} rpathdel${EXT_EXE} test_create${EXT_EXE}
-test_meta${EXT_EXE}: test_meta.o
- ${CC} test_meta.o ${LDPATH} ${LDFLAGS} -o test_meta${EXT_EXE}
-
-rpathdel${EXT_EXE}: rpathdel.o
- ${CC} rpathdel.o ${LDPATH} ${LDFLAGS} -o rpathdel${EXT_EXE}
-
-test_create${EXT_EXE}: test_create.o
- ${CC} test_create.o ${LDPATH} ${LDFLAGS} -o test_create${EXT_EXE}
-
myclean:
rm -f test_meta${EXT_EXE} test_meta.o rpathdel${EXT_EXE} rpathdel.o
diff -r f4b31e422ab0 libr/config.mk.tail
--- a/libr/config.mk.tail Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/config.mk.tail Wed Nov 02 20:41:27 2011 +0000
@@ -1,42 +1,62 @@
# config.mk.tail
-# libr/*
--include ../../config-user.mk
--include ../../global.mk
--include ../../mk/${COMPILER}.mk
+LIBR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-# libr/*/p
--include ../../../config-user.mk
--include ../../../global.mk
--include ../../../mk/${COMPILER}.mk
-
-# libr/fs/p/grub
--include ../../../../config-user.mk
--include ../../../../global.mk
--include ../../../../mk/${COMPILER}.mk
+include $(LIBR)/../config-user.mk
+include $(LIBR)/../global.mk
+include $(LIBR)/../mk/${COMPILER}.mk
CFLAGS+=-DUSE_RIO=${USE_RIO}
CFLAGS+=${CFLAGS_APPEND}
ifeq ($(WITHPIC),1)
LDFLAGS+=$(subst r_,-lr_,$(DEPS))
-LDFLAGS+=$(subst r_,-L../,$(DEPS))
+LDFLAGS+=$(subst r_,-L$(LIBR)/,$(DEPS))
LDFLAGS+=$(subst r_,-lr_,$(BINDEPS))
-LDFLAGS+=$(subst r_,-L../../,$(BINDEPS))
+LDFLAGS+=$(subst r_,-L$(LIBR)/,$(BINDEPS))
CFLAGS+=${PIC_CFLAGS}
LDFLAGS+=${PIC_CFLAGS}
else
-# TODO: is there somebody brave enought to replace this perl oneliner?
ifneq ($(DEPS),)
-#LDFLAGS+=`echo "${DEPS} " | perl -ne 's,r_([^ ]*),../$$1/libr_$$1.a,g; print'`
-#OK#LDFLAGS+=`echo $DEPS | awk '{gsub(/r_([^
]*)/,"../&/lib&.a");gsub(/\/r_/,"\/");print}'`
-LDFLAGS+=$(shell echo ${DEPS} | awk '{gsub(/r_([^
]*)/,"../&/lib&.a");gsub(/\/r_/,"\/");print}')
+LDFLAGS+=$(shell echo ${DEPS} | sed -e 's:r_\([^
]\+\):$(LIBR)/\1/libr_\1.${EXT_AR}:g')
endif
ifneq ($(BINDEPS),)
-#LDFLAGS+=`echo "${BINDEPS} " | if [ -d ../../libr ]; then perl -ne 's,r_([^
]*),../../libr/$$1/libr_$$1.a,g; print' ; else perl -ne 's,r_([^
]*),../../$$1/libr_$$1.a,g; print' ; fi `
-#OK#LDFLAGS+=`echo "${BINDEPS} " | if [ -d ../../libr ]; then echo $BINDEPS |
awk '{gsub(/r_([^ ]*)/,"../../libr/&/lib&.a");gsub(/\/r_/,"\/");print}' ; else
awk '{gsub(/r_([^ ]*)/,"../../&/lib&.a");gsub(/\/r_/,"\/");print}'; fi`
-LDFLAGS+=$(shell echo "${BINDEPS} " | if [ -d ../../libr ]; then awk
'{gsub(/r_([^ ]*)/,"../../libr/&/lib&.a");gsub(/\/r_/,"\/");print}' ; else awk
'{gsub(/r_([^ ]*)/,"../../&/lib&.a");gsub(/\/r_/,"\/");print}'; fi)
+LDLIBS+=$(shell echo "${BINDEPS} " | sed -e 's:r_\([^
]\+\):$(LIBR)/\1/libr_\1.${EXT_AR}:g')
endif
+
+#link dependencies of individual r_ libs
+#TODO: move them inside libr/*/subdeps.mk
+ifneq (,$(findstring r_db,$(BINDEPS)))
+LDLIBS+=$(LIBR)/db/sdb/src/libsdb.a
+endif
+ifneq (,$(findstring r_fs,$(BINDEPS)))
+LDLIBS+=$(LIBR)/fs/p/grub/libgrubfs.a
+endif
+ifneq (,$(findstring r_hash,$(BINDEPS)))
+LDLIBS+=-lm
+endif
+ifneq (,$(findstring r_lib,$(BINDEPS)))
+LDLIBS+=${DL_LIBS}
+endif
+ifneq (,$(findstring r_socket,$(BINDEPS)))
+ifeq (${HAVE_LIB_SSL},1)
+LDLIBS+=${SSL_LDFLAGS}
+endif
+endif
+ifneq (,$(findstring r_th,$(BINDEPS)))
+LDLIBS+=${TH_LIBS}
+endif
+ifneq (,$(findstring r_util,$(BINDEPS)))
+ifeq (${HAVE_LIB_GMP},1)
+LDLIBS+=-lgmp
+endif
+endif
+ifneq (,$(findstring r_magic,$(BINDEPS)))
+ifeq (${USE_LIB_MAGIC},1)
+LDLIBS+=-lmagic
+endif
+endif
+
endif
# Compiler: see mk/gcc.mk
@@ -51,6 +71,13 @@
BN_LIBS=-lgmp
endif
+#both of these need ssl includes
+ifneq (,$(filter r_socket r_util,$(BINDEPS)))
+ifeq (${HAVE_LIB_SSL},1)
+CFLAGS+=${SSL_CFLAGS}
+endif
+endif
+
# XXX do it in configure stage
OSTYPE?=gnulinux
# Output
diff -r f4b31e422ab0 libr/config/t/Makefile
--- a/libr/config/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/config/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,9 +1,5 @@
-include ../../config.mk
+BIN=test
+OBJ=test.o
+BINDEPS=r_config r_util
-all: test${EXT_EXE}
-
-test${EXT_EXE}:
- ${CC} ${CFLAGS} -g -I ../../include test.c -lr_config -lr_util -L..
-L../../util -o test${EXT_EXE}
-
-clean:
- rm -f test *.exe
+include ../../rules.mk
diff -r f4b31e422ab0 libr/cons/t/Makefile
--- a/libr/cons/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/cons/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,8 +1,6 @@
OBJ=hello.o
BINDEPS=r_cons r_util
BIN=hello
-LDFLAGS=-L..
-#LIBS=../*.o ../../line/*.a ../../util/*.a
include ../../rules.mk
diff -r f4b31e422ab0 libr/db/t/Makefile
--- a/libr/db/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/db/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,15 +1,4 @@
-BINDEPS=bla
-include ../../config.mk
-BIN=test${EXT_EXE}
-
-all: ${BIN}
-
-${BIN}:
-ifeq (${WITHPIC},1)
- ${CC} -g -I ../../include test.c -L.. -lr_db -lr_util -L../../util -o
${BIN}
-else
- ${CC} -g -I ../../include test.c ../libr_db.a ../sdb/src/libsdb.a
-lr_util -L../../util -o ${BIN}
-endif
-
-clean:
- rm -f ${BIN}
+BINDEPS=r_db r_util
+BIN=test
+OBJ=test.o
+include ../../rules.mk
diff -r f4b31e422ab0 libr/debug/t/Makefile
--- a/libr/debug/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/debug/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,12 +1,5 @@
-include ../../config.mk
-
OBJ=main.o
BIN=main
-BINDEPS=r_lib r_debug r_bp r_io r_reg r_cons r_util r_anal r_socket r_syscall
r_diff r_db r_parse
-LIBS+=${DL_LIBS}
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LIBS+=${SSL_LDFLAGS}
-endif
+BINDEPS=r_lib r_debug r_bp r_io r_reg r_cons r_anal r_socket r_syscall r_diff
r_db r_util
include ../../rules.mk
diff -r f4b31e422ab0 libr/diff/t/Makefile
--- a/libr/diff/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/diff/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,16 +1,5 @@
-include ../../config.mk
-
BINDEPS=r_diff r_util
-
-CFLAGS+=-DVERSION=\"${VERSION}\"
-CFLAGS+=-g -I../../include
-
-all: test${EXT_EXE}
-
-test${EXT_EXE}: test.o
- ${CC} ${CFLAGS} test.o ${LDFLAGS} -o test${EXT_EXE}
-
-myclean:
- rm -f test${EXT_EXE} test.o
+BIN=test
+OBJ=test.o
include ../../rules.mk
diff -r f4b31e422ab0 libr/egg/t/Makefile
--- a/libr/egg/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/egg/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -9,15 +9,9 @@
include ../../config.mk
-BINDEPS=r_egg r_util r_asm r_syscall r_db
-
-CFLAGS+=-DVERSION=\"${VERSION}\"
-CFLAGS+=-g -I../../include
-
-all: test${EXT_EXE}
-
-test${EXT_EXE}: test.o
- ${CC} ${CFLAGS} test.o ${LDFLAGS} -o test${EXT_EXE}
+BINDEPS=r_egg r_asm r_parse r_syscall r_db r_util r_lib
+BIN=test
+OBJ=test.o
.PHONY: t
diff -r f4b31e422ab0 libr/flags/t/Makefile
--- a/libr/flags/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/flags/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,10 +1,4 @@
-include ../../config.mk
-
-all: test${EXT_EXE}
-
-test${EXT_EXE}:
- rm -f ../flags.o
- ${CC} ${CFLAGS} -g -I ../../include test.c ../*.o -lr_util -L../../util
-L../../cons -lr_cons -o test${EXT_EXE}
-
-clean:
- rm -f test${EXT_EXE}
+BIN=test
+OBJ=test.o
+BINDEPS=r_flags r_cons r_util
+include ../../rules.mk
diff -r f4b31e422ab0 libr/hash/t/Makefile
--- a/libr/hash/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/hash/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,20 +1,5 @@
-include ../../config.mk
-
-# already appended in rules.mk ${EXT_EXE}
BINDEPS=r_io r_hash r_util r_socket
-LIBS=-lm
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
-
-all: hello${EXT_EXE}
-
-hello${EXT_EXE}: hello.o
- @#${CC} -I../../include hello.o -Wl,-R.. -L.. -L../../io -L../../util
-L../../lib -lr_util -lr_lib -lr_hash -lr_io -o hello
- ${CC} -lm hello.o ${CFLAGS} ${LDFLAGS} -o hello${EXT_EXE}
-
-myclean:
- rm -f hello${EXT_EXE} hello.o ${BIN}
+BIN=hello
+OBJ=hello.o
include ../../rules.mk
diff -r f4b31e422ab0 libr/io/t/Makefile
--- a/libr/io/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/io/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,33 +1,8 @@
-include ../../config.mk
-CFLAGS+=-I../../include -g
-
-ifeq ($(WITHPIC),1)
-LDPATH=-L.. ${LDFLAGS_LINKPATH}.. -L../../util -L../../lib -L../../socket
-LDPATH+=-lr_io -lr_util -lr_lib -lr_socket
-else
-LDPATH=../../io/libr_io.a
-LDPATH+=../../util/libr_util.a
-LDPATH+=../../socket/libr_socket.a
-LDPATH+=../../lib/libr_lib.a
-endif
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDPATH+=${SSL_LDFLAGS}
-endif
+BINDEPS=r_io r_util r_lib r_socket
all: map${EXT_EXE} cat${EXT_EXE} read4${EXT_EXE}
-cat${EXT_EXE}: cat.o
- ${CC} cat.o ${LDPATH} -g -o cat${EXT_EXE}
-
-map${EXT_EXE}: map.o
- ${CC} map.o ${LDPATH} -g -o map${EXT_EXE}
-
-read4${EXT_EXE}: read4.o
- ${CC} read4.o ${LDPATH} -g -o read4${EXT_EXE}
+include ../../rules.mk
clean:
rm -f cat read4 map *.o
-
-mrproper: clean
- -rm -f *.d
diff -r f4b31e422ab0 libr/lib/t/Makefile
--- a/libr/lib/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/lib/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,13 +1,11 @@
-include ../../config.mk
+BINDEPS=r_lib r_util
all: plugin.${EXT_SO} test-plugin${EXT_EXE}
- @true
plugin.${EXT_SO}:
${CC} ${CFLAGS} -shared -Wall -o plugin.${EXT_SO} ${LDFLAGS_LIB}
plugin.c -I../../include
-test-plugin${EXT_EXE}:
- ${CC} ../*.o ${CFLAGS} -Wall -o test-plugin${EXT_EXE} test-plugin.c
-L../../util/ -lr_util -I../../include ${DL_LIBS}
+include ../../rules.mk
clean:
-rm -f plugin.${EXT_SO} test-plugin${EXT_EXE}
diff -r f4b31e422ab0 libr/magic/Makefile
--- a/libr/magic/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/magic/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -4,6 +4,9 @@
DEPS=r_util
CFLAGS+=-I.
CFLAGS+=-DHAVE_CONFIG_H
+ifeq (${USE_LIB_MAGIC},1)
+LDFLAGS+=-lmagic
+endif
OBJ=apprentice.o ascmagic.o compress.o fsmagic.o funcs.o is_tar.o magic.o
print.o softmagic.o
include ../rules.mk
diff -r f4b31e422ab0 libr/parse/t/Makefile
--- a/libr/parse/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/parse/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,7 +1,5 @@
OBJ=parse.o
BIN=parse
-BINDEPS=r_util r_lib r_parse r_flags r_cons r_anal r_reg r_syscall r_diff r_db
-LDFLAGS+=-L..
-LIBS+=${DL_LIBS}
+BINDEPS=r_lib r_parse r_util r_flags r_cons r_anal r_reg r_syscall r_diff r_db
include ../../rules.mk
diff -r f4b31e422ab0 libr/print/t/Makefile
--- a/libr/print/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/print/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -4,10 +4,9 @@
BIN=hex
OBJ=hex.o
-BINDEPS=r_cons r_line r_print r_util r_anal r_asm r_reg r_syscall r_diff r_db
+BINDEPS=r_cons r_print r_util
fmt${EXT_EXE}: fmt.o
- ${CC} -I../../include fmt.o -L../../util -lr_util ${LDFLAGS} -o
fmt${EXT_EXE}
myclean:
rm -f fmt fmt.o
diff -r f4b31e422ab0 libr/reg/t/Makefile
--- a/libr/reg/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/reg/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,5 +1,3 @@
-include ../../config.mk
-
OBJ=test.o
BIN=regtest
BINDEPS=r_reg r_util
diff -r f4b31e422ab0 libr/rules.mk
--- a/libr/rules.mk Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/rules.mk Wed Nov 02 20:41:27 2011 +0000
@@ -1,12 +1,8 @@
-# TODO: use $VPATH here?
--include config.mk
--include ../config.mk
--include ../../config.mk
+LIBR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+include $(LIBR)/config.mk
#-------------------------------------#
# Rules for libraries
-ifeq (${BINDEPS},)
-
ifneq ($(NAME),)
ALL?=
@@ -97,26 +93,16 @@
else
-# somewhere else?
+#-------------------------------------#
+# Rules for programs (including test)
-endif
-
-else
-
-#-------------------------------------#
-# Rules for test programs
-
-# XXX can this be removed?
-#include ../../../config-user.mk
-#include ../../../mk/${COMPILER}.mk
-
-CFLAGS+=-I../../include -DVERSION=\"${VERSION}\"
+CFLAGS+=-I$(LIBR)/include -DVERSION=\"${VERSION}\"
ifneq ($(BIN),)
all: ${BIN}${EXT_EXE}
${BIN}${EXT_EXE}: ${OBJ}
- ${CC} ${OBJ} -L.. ${LDFLAGS} ${LIBS} -o ${BIN}${EXT_EXE}
+ ${CC} $+ -L.. ${LDFLAGS} ${LDLIBS} -o ${BIN}${EXT_EXE}
endif
# Dummy myclean rule that can be overriden by the t/ Makefile
diff -r f4b31e422ab0 libr/search/t/Makefile
--- a/libr/search/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/search/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,19 +1,8 @@
-BINDEPS=r_util r_search
-
-include ../../config.mk
+BINDEPS=r_search r_util
all: test${EXT_EXE} test-str${EXT_EXE} test-regexp${EXT_EXE}
include ../../rules.mk
-test${EXT_EXE}:
- ${CC} ${CFLAGS} -g -I ../../include test.c ${LDFLAGS} -o test${EXT_EXE}
-
-test-regexp${EXT_EXE}:
- ${CC} ${CFLAGS} -g -I ../../include test-regexp.c ${LDFLAGS} -o
test-regexp${EXT_EXE}
-
-test-str${EXT_EXE}:
- ${CC} ${CFLAGS} -g -I ../../include test-str.c ${LDFLAGS} -o
test-str${EXT_EXE}
-
myclean:
rm -f test${EXT_EXE} test.o test-str${EXT_EXE} test-str.o
test-regexp${EXT_EXE} test-regexp.o
diff -r f4b31e422ab0 libr/sign/t/Makefile
--- a/libr/sign/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/sign/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,5 +1,5 @@
OBJ=rasign2.o
BIN=rasign2
-BINDEPS=r_sign r_util r_anal r_reg r_syscall r_diff r_db
+BINDEPS=r_sign r_anal r_reg r_syscall r_diff r_db r_util
include ../../rules.mk
diff -r f4b31e422ab0 libr/socket/t/Makefile
--- a/libr/socket/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/socket/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,12 +1,5 @@
-include ../../config.mk
-
OBJ=serverssl.o
BIN=serverssl
BINDEPS=r_socket
-ifeq (${HAVE_LIB_SSL},1)
-CFLAGS+=${SSL_CFLAGS}
-LDFLAGS+=${SSL_LDFLAGS}
-endif
-
include ../../rules.mk
diff -r f4b31e422ab0 libr/th/t/Makefile
--- a/libr/th/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/th/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,6 +1,5 @@
OBJ=test.o
BIN=test
BINDEPS=r_th r_util
-LIBS+=${TH_LIBS}
include ../../rules.mk
diff -r f4b31e422ab0 libr/util/t/Makefile
--- a/libr/util/t/Makefile Wed Nov 02 13:39:38 2011 +0100
+++ b/libr/util/t/Makefile Wed Nov 02 20:41:27 2011 +0000
@@ -1,13 +1,4 @@
-BINDEPS=foo
-include ../../config.mk
-ifeq ($(WITHPIC),1)
-# OSX
-FLAGS=${CFLAGS} -I../../include -L.. -lr_util -g -DVERSION=\"${VERSION}\"
-EFLAGS=-L.. -lr_util
-else
-FLAGS=${CFLAGS} -I../../include -g -DVERSION=\"${VERSION}\"
-EFLAGS=../libr_util.a
-endif
+BINDEPS=r_util
BINS=test${EXT_EXE}
BINS=set0${EXT_EXE}
@@ -23,39 +14,6 @@
all: ${BINS}
-ralloc${EXT_EXE}:
- ${CC} ${FLAGS} ralloc.c ${EFLAGS} -o ralloc${EXT_EXE}
-
-test${EXT_EXE}:
- ${CC} ${FLAGS} test.c ${EFLAGS} -o test${EXT_EXE}
-
-set0${EXT_EXE}:
- ${CC} ${FLAGS} set0.c ${EFLAGS} -o set0${EXT_EXE}
-
-argv${EXT_EXE}:
- ${CC} ${FLAGS} argv.c ${EFLAGS} -o argv${EXT_EXE}
-
-test_sys${EXT_EXE}: test_sys.c
- ${CC} ${FLAGS} test_sys.c ${EFLAGS} -o test_sys${EXT_EXE}
-
-test_str${EXT_EXE}: test_str.c
- ${CC} ${FLAGS} test_str.c ${EFLAGS} -o test_str${EXT_EXE}
-
-pool${EXT_EXE}:
- ${CC} ${FLAGS} pool.c ${EFLAGS} -o pool${EXT_EXE}
-
-rax2${EXT_EXE}:
- ${CC} ${FLAGS} rax2.c ${EFLAGS} -o rax2${EXT_EXE}
-
-array${EXT_EXE}:
- ${CC} ${FLAGS} array.c ${EFLAGS} -o array${EXT_EXE}
-
-test_file_slurp_hexpairs${EXT_EXE}:
- ${CC} ${FLAGS} test_file_slurp_hexpairs.c ${EFLAGS} -o
test_file_slurp_hexpairs${EXT_EXE}
-
-test_cmd_str${EXT_EXE}:
- ${CC} ${FLAGS} test_cmd_str.c ${EFLAGS} -o test_cmd_str${EXT_EXE}
-
myclean:
rm -f ${BINS}
_______________________________________________
radare mailing list
[email protected]
http://lists.nopcode.org/listinfo.cgi/radare-nopcode.org
