--- a/Makefile	Sat Dec 01 20:34:55 2012 +0100
+++ b/Makefile	Mon Aug 12 14:40:19 2013 +0200
@@ -35,16 +35,14 @@
 #   osx
 #
 
-#ifndef CONF
-	CONF=gcc
-#endif
+CONF=gcc
 
 include $(CONF).mk
 
-all: build ucx dav
+all: build/tool ucx dav
 
-build:
-	mkdir build
+build/tool:
+	mkdir -p build/tool
 
 ucx: FORCE build
 	cd ucx; $(MAKE) CONF=$(CONF) all
@@ -56,7 +54,7 @@
 	./build/dav$(APP_EXT)
 
 clean: FORCE
-	$(RM) $(RMFLAGS) build/*.${OBJ_EXT}
+	$(RM) $(RMFLAGS) build/*.${OBJ_EXT} build/tool/*.${OBJ_EXT}
 
 FORCE: