Glyn Kennington wrote:
> Trying a different approach - here's a relatively small change that
> switches some of the .mk files to use absolute paths, moves (most of)
> the LDFLAGS setting out of binr/*/Makefile, and trims those unwieldy
> replacement commands down to simple seds.
And following that, some dependency order fixes and removal of redundant
code in libr/*/t/Makefile, in order to keep the tests compiling. I
haven't checked that they all do anything useful once compiled...
Glyn
diff -r 6c710744c342 libr/anal/t/Makefile
--- a/libr/anal/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/anal/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/bin/t/Makefile
--- a/libr/bin/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/bin/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/config/t/Makefile
--- a/libr/config/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/config/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/cons/t/Makefile
--- a/libr/cons/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/cons/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/db/t/Makefile
--- a/libr/db/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/db/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -1,11 +1,4 @@
-BINDEPS=bla
-include ../../config.mk
-BIN=test${EXT_EXE}
-
-all: ${BIN}
-
-${BIN}: test.c
- ${CC} -g -I ../../include test.c -L.. -lr_db -lr_util -L../../util -o
${BIN}
-
-clean:
- rm -f ${BIN}
+BINDEPS=r_db r_util
+BIN=test
+OBJ=test.o
+include ../../rules.mk
diff -r 6c710744c342 libr/debug/t/Makefile
--- a/libr/debug/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/debug/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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
-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 6c710744c342 libr/diff/t/Makefile
--- a/libr/diff/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/diff/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/egg/t/Makefile
--- a/libr/egg/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/egg/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -1,16 +1,7 @@
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}
-
-myclean:
- rm -f test${EXT_EXE} test.o
+BINDEPS=r_egg r_asm r_parse r_syscall r_db r_util r_lib
+BIN=test
+OBJ=test.o
include ../../rules.mk
diff -r 6c710744c342 libr/flags/t/Makefile
--- a/libr/flags/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/flags/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/hash/t/Makefile
--- a/libr/hash/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/hash/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/io/t/Makefile
--- a/libr/io/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/io/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/lib/t/Makefile
--- a/libr/lib/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/lib/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/parse/t/Makefile
--- a/libr/parse/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/parse/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/print/t/Makefile
--- a/libr/print/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/print/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/reg/t/Makefile
--- a/libr/reg/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/reg/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -1,5 +1,3 @@
-include ../../config.mk
-
OBJ=test.o
BIN=regtest
BINDEPS=r_reg r_util
diff -r 6c710744c342 libr/search/t/Makefile
--- a/libr/search/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/search/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/sign/t/Makefile
--- a/libr/sign/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/sign/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/socket/t/Makefile
--- a/libr/socket/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/socket/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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 6c710744c342 libr/th/t/Makefile
--- a/libr/th/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/th/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -1,6 +1,5 @@
OBJ=test.o
BIN=test
BINDEPS=r_th r_util
-LIBS+=${TH_LIBS}
include ../../rules.mk
diff -r 6c710744c342 libr/util/t/Makefile
--- a/libr/util/t/Makefile Wed Oct 12 05:22:00 2011 +0200
+++ b/libr/util/t/Makefile Thu Oct 13 18:25:01 2011 +0100
@@ -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
