mod_http: Use hostname from the correct context (thanks gryffus)

[prosody.git] / util-src / Makefile

diff --git a/util-src/Makefile b/util-src/Makefile
index 4b2606dc77907ee88b404665dd43cedc4db47766..3a1ba3f2af1f69f506c6ddfb93c5c4f51837e90c 100644 (file)
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -7,23 +7,35 @@ LUA_LIB?=lua$(LUA_SUFFIX)
 IDN_LIB?=idn
 OPENSSL_LIB?=crypto
 CC?=gcc
+CXX?=g++
 LD?=gcc
+CFLAGS+=-ggdb
 
+.PHONY: all install clean
 .SUFFIXES: .c .o .so
 
-.c.o:
-       $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $<
-
-.o.so:
-       MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
-       $(LD) $(LDFLAGS) -o $@ $< -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn -lcrypto
+all: encodings.so hashes.so net.so pposix.so signal.so
 
-all: encodings.so hashes.so pposix.so signal.so
-
-install: encodings.so hashes.so pposix.so signal.so
+install: encodings.so hashes.so net.so pposix.so signal.so
        install *.so ../util/
 
 clean:
        rm -f *.o
        rm -f *.so
        rm -f ../util/*.so
+
+encodings.so: encodings.o
+       MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+       $(CC) -o $@ $< $(LDFLAGS) $(IDNA_LIBS)
+
+hashes.so: hashes.o
+       MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+       $(CC) -o $@ $< $(LDFLAGS) -l$(OPENSSL_LIB)
+
+.c.o:
+       $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $<
+
+.o.so:
+       MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+       $(LD) -o $@ $< $(LDFLAGS)
+