diff -r adb0bda54e6b -r a2c8fc23c90e src/server/daemon/Makefile
--- a/src/server/daemon/Makefile	Thu Feb 16 15:08:38 2012 +0100
+++ b/src/server/daemon/Makefile	Wed Feb 22 23:20:39 2012 +0100
@@ -26,19 +26,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-BUILD_ROOT = ../../../
-OBJ_DIR = $(BUILD_ROOT)build/
-
-CFLAGS  = -I/usr/include/mps -g
-LDFLAGS = 
-
-include objs.mk
+DMN_CFLAGS = -I/usr/include/mps -g
 
-all: $(DAEMONOBJS)
+$(DMN_OBJPRE)%.o: daemon/%.c
+	cc -o $@ -c $(DMN_CFLAGS) $(CFLAGS) $<
 
-$(DMN_OBJPRE)%.o: %.c
-	cc -o $@ -c $(CFLAGS) $<
-
-$(DMN_OBJPRE)%.o: %.cpp
-	CC -o $@ -c $(CFLAGS) $<
+$(DMN_OBJPRE)%.o: daemon/%.cpp
+	CC -o $@ -c $(DMN_CFLAGS) $(CFLAGS) $<