diff -r 8346aebfbb7b -r 45395ba5ed30 Makefile
--- a/Makefile	Fri Sep 06 17:01:53 2013 +0200
+++ b/Makefile	Mon Sep 09 10:48:08 2013 +0200
@@ -29,33 +29,43 @@
 
 #
 # available configurations:
-#   clang,   clang-debug
-#   gcc,     gcc-debug
-#   g++,     g++-debug
-#   osx,     osx-debug
-#   suncc,   suncc-debug
+#   clang
+#   gcc
+#   g++
+#   osx
+#   suncc
 #   windows
 #
 
 CONF=gcc
 PREFIX=/usr/local
 
-include unix.mk
 include $(CONF).mk
 
 all: ucx test
 
 ucx: FORCE
-	cd ucx; $(MAKE) CONF=$(CONF) all
+	cd ucx; $(MAKE) CONF=$(CONF)
+
+ucx-debug: FORCE
+	cd ucx; $(MAKE) CONF=$(CONF) debug
 	
 test: FORCE ucx
-	cd test; $(MAKE) CONF=$(CONF) all
+	cd test; $(MAKE) CONF=$(CONF)
+
+test-debug: FORCE ucx-debug
+	cd test; $(MAKE) CONF=$(CONF) debug
 
 run: FORCE test
-	./build/test$(APP_EXT)
+	./build/release/test/ucxtest$(APP_EXT)
+	
+run-debug: FORCE test-debug
+	./build/debug/test/ucxtest$(APP_EXT)
+	
+debug: ucx-debug test-debug
 
 install: ucx $(PREFIX)/lib $(PREFIX)/include/ucx
-	cp ./build/libucx$(LIB_EXT) $(PREFIX)/lib && \
+	cp ./build/release/libucx$(LIB_EXT) $(PREFIX)/lib && \
         cp ./ucx/*.h $(PREFIX)/include/ucx
 
 uninstall: