Mercurial > hg > webserver / file diff

--- a/src/server/Makefile	Sat Jan 14 14:33:38 2012 +0100
+++ b/src/server/Makefile	Sun Jan 15 17:00:16 2012 +0100
@@ -41,29 +41,32 @@
 include safs/objs.mk
 include webdav/objs.mk
 include daemon/objs.mk
+include config/objs.mk
 
-MAINOBJS = $(UCXOBJS) $(UTILOBJS) $(SAFOBJS) $(DAVOBJS) $(DAEMONOBJS)
+MAINOBJS = $(UCXOBJS) $(UTILOBJS) $(SAFOBJS) $(DAVOBJS) $(DAEMONOBJS) $(CONFOBJS)
 
-OBJ_DIRS = daemon safs ucx util webdav
+OBJ_DIRS = daemon safs ucx util webdav config
 MK_OBJ_DIRS = $(OBJ_DIRS:%=$(OBJ_DIR)server/%)
+MK_OBJ_DIRS += $(BUILD_ROOT)work/bin
 
 preparation: $(MK_OBJ_DIRS)
-	mkdir -p $(BUILD_ROOT)work/bin
 	
 $(MK_OBJ_DIRS):
 	mkdir -p $@
 
-$(MAIN_TARGET): $(DAEMONOBJS) $(UCXOBJS) $(UTILOBJS) $(SAFOBJS) $(DAVOBJS)
+$(MAIN_TARGET): $(MAINOBJS)
 	CC -o $(MAIN_TARGET) $(LDFLAGS) $(MAINOBJS)
 
-$(DAEMONOBJS): $(UCXOBJS)
+$(DAEMONOBJS): $(DAEMONSOURCE)
 	cd daemon; $(MAKE) all
-$(UCXOBJS):
+$(UCXOBJS): $(UCXSOURCE)
 	cd ucx; $(MAKE) all
-$(UTILOBJS):
+$(UTILOBJS): $(UTILSOURCE)
 	cd util; $(MAKE) all
-$(SAFOBJS):
+$(SAFOBJS): $(SAFSOURCE)
 	cd safs; $(MAKE) all
-$(DAVOBJS):
+$(CONFOBJS): $(CONFSOURCE)
+	cd config; $(MAKE) all
+$(DAVOBJS): $(DAVSOURCE)
 	cd webdav; $(MAKE) all