Mercurial > hg > dav / changeset

--- a/dav/Makefile	Sun Nov 09 14:33:23 2014 +0100
+++ b/dav/Makefile	Fri Dec 12 13:57:41 2014 +0100
@@ -39,21 +39,21 @@
 SYNC_SRC += db.c
 
 
-DAV_OBJ = $(DAV_SRC:%.c=../build/tool/%.$(OBJ_EXT))
-SYNC_OBJ = $(SYNC_SRC:%.c=../build/tool/%.$(OBJ_EXT))
+DAV_OBJ = $(DAV_SRC:%.c=../build/tool/%$(OBJ_EXT))
+SYNC_OBJ = $(SYNC_SRC:%.c=../build/tool/%$(OBJ_EXT))
 
 all: ../build/dav ../build/dav-sync
 
-../build/dav: $(DAV_OBJ) ../build/libidav.$(LIB_EXT)
+../build/dav: $(DAV_OBJ) ../build/libidav$(LIB_EXT)
 	$(LD) -o ../build/dav$(APP_EXT) $(DAV_OBJ) \
-		../build/libidav.$(LIB_EXT) ../build/libucx.$(LIB_EXT)  \
+		../build/libidav$(LIB_EXT) ../build/libucx$(LIB_EXT)  \
 		$(LDFLAGS) $(DAV_LDFLAGS)
 
-../build/dav-sync: $(SYNC_OBJ) ../build/libidav.$(LIB_EXT)
+../build/dav-sync: $(SYNC_OBJ) ../build/libidav$(LIB_EXT)
 	$(LD) -o ../build/dav-sync$(APP_EXT) $(SYNC_OBJ) \
-		../build/libidav.$(LIB_EXT) ../build/libucx.$(LIB_EXT)  \
+		../build/libidav$(LIB_EXT) ../build/libucx$(LIB_EXT)  \
 		$(LDFLAGS) $(DAV_LDFLAGS)
 
-../build/tool/%.$(OBJ_EXT): %.c 
+../build/tool/%$(OBJ_EXT): %.c 
 	$(CC) $(CFLAGS) $(DAV_CFLAGS) -I../ -o $@ $<
 

--- a/gcc.mk	Sun Nov 09 14:33:23 2014 +0100
+++ b/gcc.mk	Fri Dec 12 13:57:41 2014 +0100
@@ -38,8 +38,8 @@
 ARFLAGS = -r
 RMFLAGS = -f
 
-OBJ_EXT = o
-LIB_EXT = a
+OBJ_EXT = .o
+LIB_EXT = .a
 APP_EXT =
 
 DAV_CFLAGS = `curl-config --cflags` `pkg-config --cflags openssl libxml-2.0`

--- a/libidav/Makefile	Sun Nov 09 14:33:23 2014 +0100
+++ b/libidav/Makefile	Fri Dec 12 13:57:41 2014 +0100
@@ -37,14 +37,14 @@
 SRC += davql.c
 SRC += crypto.c
 
-OBJ = $(SRC:%.c=../build/libidav/%.$(OBJ_EXT))
+OBJ = $(SRC:%.c=../build/libidav/%$(OBJ_EXT))
 
-all: ../build/ucx ../build/libidav.$(LIB_EXT)
+all: ../build/ucx ../build/libidav$(LIB_EXT)
 
-../build/libidav.$(LIB_EXT): $(OBJ)
-	$(AR) $(ARFLAGS) $(AOFLAGS)../build/libidav.$(LIB_EXT) $(OBJ)
+../build/libidav$(LIB_EXT): $(OBJ)
+	$(AR) $(ARFLAGS) $(AOFLAGS)../build/libidav$(LIB_EXT) $(OBJ)
 
-../build/libidav/%.$(OBJ_EXT): %.c
+../build/libidav/%$(OBJ_EXT): %.c
 	$(CC) $(CFLAGS) $(DAV_CFLAGS) -I../ $(COFLAGS)$@ $<
 
 ../build/idav:

--- a/mingw.mk	Sun Nov 09 14:33:23 2014 +0100
+++ b/mingw.mk	Fri Dec 12 13:57:41 2014 +0100
@@ -38,9 +38,9 @@
 ARFLAGS = -r
 RMFLAGS = -f
 
-OBJ_EXT = o
-LIB_EXT = a
-APP_EXT =
+OBJ_EXT = .o
+LIB_EXT = .a
+APP_EXT = .exe
 
 DAV_CFLAGS = -I /mingw/include/libxml2
 DAV_LDFLAGS = -lcurl -lssl -lcrypto -lxml2

--- a/osx.mk	Sun Nov 09 14:33:23 2014 +0100
+++ b/osx.mk	Fri Dec 12 13:57:41 2014 +0100
@@ -38,8 +38,8 @@
 ARFLAGS = -r
 RMFLAGS = -f
 
-OBJ_EXT = o
-LIB_EXT = a
+OBJ_EXT = .o
+LIB_EXT = .a
 APP_EXT =
 
 DAV_CFLAGS = `xml2-config --cflags`

--- a/suncc.mk	Sun Nov 09 14:33:23 2014 +0100
+++ b/suncc.mk	Fri Dec 12 13:57:41 2014 +0100
@@ -38,8 +38,8 @@
 ARFLAGS = -r
 RMFLAGS = -f
 
-OBJ_EXT = o
-LIB_EXT = a
+OBJ_EXT = .o
+LIB_EXT = .a
 APP_EXT =
 
 DAV_CFLAGS = `curl-config --cflags` `pkg-config --cflags openssl libxml-2.0`

--- a/ucx/Makefile	Sun Nov 09 14:33:23 2014 +0100
+++ b/ucx/Makefile	Fri Dec 12 13:57:41 2014 +0100
@@ -42,10 +42,10 @@
 
 OBJ = $(SRC:%.c=../build/ucx/%$(OBJ_EXT))
 
-all: ../build/ucx ../build/libucx.$(LIB_EXT)
+all: ../build/ucx ../build/libucx$(LIB_EXT)
 
-../build/libucx.$(LIB_EXT): $(OBJ)
-	$(AR) $(ARFLAGS) $(AOFLAGS)../build/libucx.$(LIB_EXT) $(OBJ)
+../build/libucx$(LIB_EXT): $(OBJ)
+	$(AR) $(ARFLAGS) $(AOFLAGS)../build/libucx$(LIB_EXT) $(OBJ)
 
 ../build/ucx/%$(OBJ_EXT): %.c
 	$(CC) $(CFLAGS) $(COFLAGS)$@ $<