Mercurial > hg > dav / changeset

--- a/dav/Makefile	Sat Aug 17 14:34:15 2013 +0200
+++ b/dav/Makefile	Sat Aug 17 14:57:17 2013 +0200
@@ -28,8 +28,8 @@
 
 include ../$(CONF).mk
 
-CFLAGS += `curl-config --cflags` `/opt/local/bin/pkg-config --cflags openssl libxml-2.0`
-LDFLAGS += `curl-config --libs` `/opt/local/bin/pkg-config --libs openssl libxml-2.0` 
+DAV_CFLAGS = `curl-config --cflags` `pkg-config --cflags openssl libxml-2.0`
+DAV_LDFLAGS = `curl-config --libs` `pkg-config --libs openssl libxml-2.0` 
 
 SRC  = main.c
 SRC += utils.c
@@ -47,8 +47,8 @@
 
 ../build/dav: $(OBJ)
 	$(LD) -o ../build/dav$(APP_EXT) $(OBJ) \
-		../build/libucx.$(LIB_EXT) $(LDFLAGS)
+		../build/libucx.$(LIB_EXT) $(LDFLAGS) $(DAV_LDFLAGS)
 
 ../build/tool/%.$(OBJ_EXT): %.c 
-	$(CC) $(CFLAGS) -I../ -o $@ $<
+	$(CC) $(CFLAGS) $(DAV_CFLAGS) -I../ -o $@ $<
 

--- a/gcc.mk	Sat Aug 17 14:34:15 2013 +0200
+++ b/gcc.mk	Sat Aug 17 14:57:17 2013 +0200
@@ -42,3 +42,6 @@
 LIB_EXT = a
 APP_EXT =
 
+DAV_CFLAGS = `curl-config --cflags` `pkg-config --cflags openssl libxml-2.0`
+DAV_LDFLAGS = `curl-config --libs` `pkg-config --libs openssl libxml-2.0`
+

--- a/osx.mk	Sat Aug 17 14:34:15 2013 +0200
+++ b/osx.mk	Sat Aug 17 14:57:17 2013 +0200
@@ -42,3 +42,5 @@
 LIB_EXT = a
 APP_EXT =
 
+DAV_CFLAGS = -I/usr/include/libxml2
+DAV_LDFLAGS = -lcurl -lxml2 -lssl -lcrypto

--- a/suncc.mk	Sat Aug 17 14:34:15 2013 +0200
+++ b/suncc.mk	Sat Aug 17 14:57:17 2013 +0200
@@ -42,3 +42,6 @@
 LIB_EXT = a
 APP_EXT =
 
+DAV_CFLAGS = `curl-config --cflags` `pkg-config --cflags openssl libxml-2.0`
+DAV_LDFLAGS = `curl-config --libs` `pkg-config --libs openssl libxml-2.0`
+