Mercurial > hg > webserver / file diff

--- a/src/server/Makefile	Wed Jul 31 13:02:06 2013 +0200
+++ b/src/server/Makefile	Sun Sep 08 23:27:07 2013 +0200
@@ -33,11 +33,11 @@
 
 OBJ_DIR = $(BUILD_ROOT)/build/
 
-MAIN_TARGET = $(BUILD_ROOT)/work/bin/webservd
+MAIN_TARGET = $(BUILD_ROOT)/build/bin/webservd
 
 all: preparation $(MAIN_TARGET) $(PLUGINS)
 
-include ucx/objs.mk
+#include ucx/objs.mk
 include util/objs.mk
 include safs/objs.mk
 include webdav/objs.mk
@@ -45,7 +45,6 @@
 include config/objs.mk
 include admin/objs.mk
 
-include ucx/Makefile
 include util/Makefile
 include safs/Makefile
 include webdav/Makefile
@@ -57,9 +56,8 @@
 
 OBJ_DIRS = daemon safs ucx util webdav config admin plugins
 MK_OBJ_DIRS = $(OBJ_DIRS:%=$(OBJ_DIR)server/%)
-MK_OBJ_DIRS += $(BUILD_ROOT)/work/bin
 
-include ucx/Makefile
+LDFLAGS += -lucx
 
 preparation: $(MK_OBJ_DIRS)
 	
@@ -67,7 +65,7 @@
 	mkdir -p $@
 
 $(MAIN_TARGET): $(MAINOBJS)
-	$(CXX) -o $(MAIN_TARGET) $(MAINOBJS) $(LDFLAGS)
+	$(CXX) -o $(MAIN_TARGET) $(MAINOBJS) -L$(BUILD_ROOT)/build/lib $(LDFLAGS)
 
 
 ../../build/server/ucx/%.o: %.c