Mercurial > hg > dav / file diff

--- a/dav/Makefile	Wed Nov 02 11:45:56 2022 +0100
+++ b/dav/Makefile	Sat Feb 25 11:01:46 2023 +0100
@@ -26,9 +26,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-CONF=gcc
-include ../$(CONF).mk
-include ../cppcheck.mk
+BUILD_ROOT = ..
+
+include ../config.mk
 
 DAV_SRC  = main.c
 DAV_SRC += config.c
@@ -61,24 +61,27 @@
 SYNC_OBJ = $(SYNC_SRC:%.c=../build/tool/%$(OBJ_EXT))
 XATTR_OBJ = $(XATTR_SRC:%.c=../build/tool/%$(OBJ_EXT))
 
-
-all: ../build/dav ../build/dav-sync ../build/xattrtool
+DAV_BIN = ../build/bin/dav$(APP_EXT)
+DAV_SYNC_BIN = ../build/bin/dav-sync$(APP_EXT)
+XATTRTOOL_BIN = ../build/bin/xattrtool$(APP_EXT)
 
-../build/dav: $(DAV_OBJ) ../build/libidav$(LIB_EXT)
-	$(LD) -o ../build/dav$(APP_EXT) $(DAV_OBJ) \
+all: ../build/bin/dav ../build/bin/dav-sync ../build/bin/xattrtool
+
+$(DAV_BIN): $(DAV_OBJ) ../build/libidav$(LIB_EXT)
+	$(LD) -o $(DAV_BIN) $(DAV_OBJ) \
 		../build/libidav$(LIB_EXT) ../build/libucx$(LIB_EXT)  \
 		$(LDFLAGS) $(DAV_LDFLAGS)
 
-../build/dav-sync: $(SYNC_OBJ) ../build/libidav$(LIB_EXT)
-	$(LD) -o ../build/dav-sync$(APP_EXT) $(SYNC_OBJ) \
+$(DAV_SYNC_BIN): $(SYNC_OBJ) ../build/libidav$(LIB_EXT)
+	$(LD) -o $(DAV_SYNC_BIN) $(SYNC_OBJ) \
 		../build/libidav$(LIB_EXT) ../build/libucx$(LIB_EXT)  \
 		$(LDFLAGS) $(DAV_LDFLAGS)
 
-../build/xattrtool: $(XATTR_OBJ)
-	$(LD) -o ../build/xattrtool$(APP_EXT) $(XATTR_OBJ) $(LDFLAGS)
+$(XATTRTOOL_BIN): $(XATTR_OBJ)
+	$(LD) -o $(XATTRTOOL_BIN) $(XATTR_OBJ) $(LDFLAGS)
 
 ../build/tool/%$(OBJ_EXT): %.c 
-	$(CC) $(CFLAGS) $(DAV_CFLAGS) -I../ -I../ucx -o $@ $<
+	$(CC) $(CFLAGS) $(DAV_CFLAGS) -I../ -I../ucx -c -o $@ $<
 
 
 cppcheck: $(DAV_SRC) $(SYNC_SRC)