diff -r 8346aebfbb7b -r 45395ba5ed30 test/Makefile
--- a/test/Makefile	Fri Sep 06 17:01:53 2013 +0200
+++ b/test/Makefile	Mon Sep 09 10:48:08 2013 +0200
@@ -26,7 +26,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-include ../unix.mk
 include ../$(CONF).mk
 
 SRC  = main.c
@@ -39,16 +38,28 @@
 SRC += buffer_tests.c
 SRC += utils_tests.c
 
-OBJ = $(SRC:%.c=../build/%$(OBJ_EXT))
+OBJ   = $(SRC:%.c=../build/release/test/%$(OBJ_EXT))
+OBJ_D = $(SRC:%.c=../build/debug/test/%$(OBJ_EXT))
 
-all: ../build/ ../build/test
+all: ../build/release/test ../build/release/test/ucxtest$(APP_EXT)
+debug: ../build/debug/test ../build/debug/test/ucxtest$(APP_EXT)
 
-../build/test: $(OBJ)
-	$(LD) $(LDFLAGS) $(LOFLAGS)../build/test$(APP_EXT) $(OBJ) \
-		../build/libucx$(LIB_EXT)
+../build/release/test/ucxtest$(APP_EXT): $(OBJ)
+	$(LD) $(LDFLAGS) $(LOFLAGS)../build/release/test/ucxtest$(APP_EXT) \
+		$(OBJ) ../build/release/libucx$(LIB_EXT)
 
-../build/%$(OBJ_EXT): %.c
+../build/release/test/%$(OBJ_EXT): %.c
 	$(CC) $(CFLAGS) -I../ $(COFLAGS)$@ $<
 
-../build:
-	$(MKDIR) $(MKDIRFLAGS) ../build/test
+../build/release/test:
+	$(MKDIR) $(MKDIRFLAGS) ../build/release/test
+
+../build/debug/test/ucxtest$(APP_EXT): $(OBJ_D)
+	$(LD) $(LDFLAGS_D) $(LOFLAGS)../build/debug/test/ucxtest$(APP_EXT) \
+		$(OBJ_D) ../build/debug/libucx$(LIB_EXT)
+
+../build/debug/test/%$(OBJ_EXT): %.c
+	$(CC) $(CFLAGS_D) -I../ $(COFLAGS)$@ $<
+
+../build/debug/test:
+	$(MKDIR) $(MKDIRFLAGS) ../build/debug/test