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 4058b59da15e71c55f94277237ae3b7e3f23a309..3a1ba3f2af1f69f506c6ddfb93c5c4f51837e90c 100644 (file)
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -7,33 +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
 
-all: encodings.so hashes.so pposix.so
+all: encodings.so hashes.so net.so pposix.so signal.so
 
-install: encodings.so hashes.so pposix.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.o: encodings.c
-       $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
 encodings.so: encodings.o
-       export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn
-       
+       MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+       $(CC) -o $@ $< $(LDFLAGS) $(IDNA_LIBS)
 
-hashes.o: hashes.c
-       $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
 hashes.so: hashes.o
-       export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o hashes.so hashes.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lcrypto
+       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)
 
-pposix.o: pposix.c
-       $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
-pposix.so: pposix.o
-       export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
-