dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Import Glyn Kennington's patch for the build system 

- Use absolute paths everywhere and simplify Makefiles
This commit is contained in:
pancake 2011-11-03 11:49:50 +01:00
parent 766cec4bb2
commit 14f85bd76f
34 changed files with 103 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
binr/binr.mk
View File

@ -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}

14
binr/rabin2/Makefile
View File

@ -2,17 +2,3 @@ BIN=rabin2
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

26
binr/radare2/Makefile
View File

@ -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 @@ osxsign:
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

20
binr/radiff2/Makefile
View File

@ -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

13
binr/rafind2/Makefile
View File

@ -3,16 +3,3 @@ BINDEPS=r_search r_io r_print r_lib r_asm r_anal r_reg r_cons r_util r_syscall r
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

7
binr/ragg2/Makefile
View File

@ -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}

3
binr/rahash2/Makefile
View File

@ -3,9 +3,6 @@ BINDEPS=r_io r_hash r_util r_print r_socket r_asm r_cons r_anal r_lib r_syscall
include ../binr.mk
ifeq ($(WITHNONPIC),1)
LDFLAGS+=-lm
endif
ifeq ($(OSTYPE),android)
LDFLAGS+=-lm
endif

8
binr/ranal2/Makefile
View File

@ -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

1
binr/rarun2/Makefile
View File

@ -1,5 +1,4 @@
BIN=rarun2
BINDEPS=r_util
OBJ=main.o
include ../binr.mk

4
binr/rasm2/Makefile
View File

@ -2,7 +2,3 @@ BIN=rasm2
BINDEPS=r_asm r_util r_lib r_parse
include ../binr.mk
ifeq ($(WITHNONPIC),1)
LDFLAGS+=${DL_LIBS}
endif

2
binr/rsc2/Makefile
View File

@ -1,4 +1,4 @@
BIN=rsc2
DEPS=
BINDEPS=r_util
include ../binr.mk

21
libr/anal/t/Makefile
View File

@ -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

13
libr/bin/t/Makefile
View File

@ -2,22 +2,9 @@ include ../../config.mk
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

71
libr/config.mk.tail
View File

@ -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 @@ CFLAGS+=-DHAVE_LIB_GMP=1
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

12
libr/config/t/Makefile
View File

@ -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

2
libr/cons/t/Makefile
View File

@ -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

19
libr/db/t/Makefile
View File

@ -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

9
libr/debug/t/Makefile
View File

@ -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

15
libr/diff/t/Makefile
View File

@ -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

12
libr/egg/t/Makefile
View File

@ -9,15 +9,9 @@ TESTS+=fun5 fun6
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

14
libr/flags/t/Makefile
View File

@ -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

19
libr/hash/t/Makefile
View File

@ -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

29
libr/io/t/Makefile
View File

@ -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

6
libr/lib/t/Makefile
View File

@ -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}

3
libr/magic/Makefile
View File

@ -4,6 +4,9 @@ NAME=r_magic
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

4
libr/parse/t/Makefile
View File

@ -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

3
libr/print/t/Makefile
View File

@ -4,10 +4,9 @@ all: hex fmt
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

2
libr/reg/t/Makefile
View File

@ -1,5 +1,3 @@
include ../../config.mk
OBJ=test.o
BIN=regtest
BINDEPS=r_reg r_util

26
libr/rules.mk
View File

@ -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 @@ sloc:
else
# somewhere else?
endif
else
#-------------------------------------#
# Rules for test programs
# Rules for programs (including test)
# 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
@ -124,7 +110,7 @@ endif
myclean:
clean: myclean
-rm -f ${OBJ} ${BIN}
-rm -f ${OBJS} ${OBJ} ${BIN}
mrproper: clean
-rm -f *.d

13
libr/search/t/Makefile
View File

@ -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

2
libr/sign/t/Makefile
View File

@ -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

7
libr/socket/t/Makefile
View File

@ -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

1
libr/th/t/Makefile
View File

@ -1,6 +1,5 @@
OBJ=test.o
BIN=test
BINDEPS=r_th r_util
LIBS+=${TH_LIBS}
include ../../rules.mk

44
libr/util/t/Makefile
View File

@ -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 @@ BINS+=test_cmd_str${EXT_EXE}
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}