# HG changeset patch # User Mike Becker # Date 1418389061 -3600 # Node ID 6b0c606596524ef01f535858d1f93812977ae5ce # Parent f8c1f685e08e69d4d69fb8e69ea456f12140b826 fixed makefile file extensions diff -r f8c1f685e08e -r 6b0c60659652 dav/Makefile --- 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 $@ $< diff -r f8c1f685e08e -r 6b0c60659652 gcc.mk --- 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` diff -r f8c1f685e08e -r 6b0c60659652 libidav/Makefile --- 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: diff -r f8c1f685e08e -r 6b0c60659652 mingw.mk --- 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 diff -r f8c1f685e08e -r 6b0c60659652 osx.mk --- 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` diff -r f8c1f685e08e -r 6b0c60659652 suncc.mk --- 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` diff -r f8c1f685e08e -r 6b0c60659652 ucx/Makefile --- 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)$@ $<