1.1 --- a/test/Makefile Fri Sep 06 17:01:53 2013 +0200 1.2 +++ b/test/Makefile Mon Sep 09 10:48:08 2013 +0200 1.3 @@ -26,7 +26,6 @@ 1.4 # POSSIBILITY OF SUCH DAMAGE. 1.5 # 1.6 1.7 -include ../unix.mk 1.8 include ../$(CONF).mk 1.9 1.10 SRC = main.c 1.11 @@ -39,16 +38,28 @@ 1.12 SRC += buffer_tests.c 1.13 SRC += utils_tests.c 1.14 1.15 -OBJ = $(SRC:%.c=../build/%$(OBJ_EXT)) 1.16 +OBJ = $(SRC:%.c=../build/release/test/%$(OBJ_EXT)) 1.17 +OBJ_D = $(SRC:%.c=../build/debug/test/%$(OBJ_EXT)) 1.18 1.19 -all: ../build/ ../build/test 1.20 +all: ../build/release/test ../build/release/test/ucxtest$(APP_EXT) 1.21 +debug: ../build/debug/test ../build/debug/test/ucxtest$(APP_EXT) 1.22 1.23 -../build/test: $(OBJ) 1.24 - $(LD) $(LDFLAGS) $(LOFLAGS)../build/test$(APP_EXT) $(OBJ) \ 1.25 - ../build/libucx$(LIB_EXT) 1.26 +../build/release/test/ucxtest$(APP_EXT): $(OBJ) 1.27 + $(LD) $(LDFLAGS) $(LOFLAGS)../build/release/test/ucxtest$(APP_EXT) \ 1.28 + $(OBJ) ../build/release/libucx$(LIB_EXT) 1.29 1.30 -../build/%$(OBJ_EXT): %.c 1.31 +../build/release/test/%$(OBJ_EXT): %.c 1.32 $(CC) $(CFLAGS) -I../ $(COFLAGS)$@ $< 1.33 1.34 -../build: 1.35 - $(MKDIR) $(MKDIRFLAGS) ../build/test 1.36 +../build/release/test: 1.37 + $(MKDIR) $(MKDIRFLAGS) ../build/release/test 1.38 + 1.39 +../build/debug/test/ucxtest$(APP_EXT): $(OBJ_D) 1.40 + $(LD) $(LDFLAGS_D) $(LOFLAGS)../build/debug/test/ucxtest$(APP_EXT) \ 1.41 + $(OBJ_D) ../build/debug/libucx$(LIB_EXT) 1.42 + 1.43 +../build/debug/test/%$(OBJ_EXT): %.c 1.44 + $(CC) $(CFLAGS_D) -I../ $(COFLAGS)$@ $< 1.45 + 1.46 +../build/debug/test: 1.47 + $(MKDIR) $(MKDIRFLAGS) ../build/debug/test