X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util-src%2FMakefile;h=008a193499f6fba841a3d43cd64d6d6dc8124b7f;hb=ca491a8ad0830e4dc72be81824eb194170dc0c7c;hp=035ec286f5bd8f5517ac92541df57e2c49b34a5a;hpb=225148e2141dc3a466a39244b71bd606b8d27a40;p=prosody.git

diff --git a/util-src/Makefile b/util-src/Makefile
index 035ec286..008a1934 100644
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -1,25 +1,37 @@
 
+include ../config.unix
 
-LUA_INCLUDE=/usr/include/lua51
-LUA_LIB=lua5.1
+LUA_SUFFIX?=5.1
+LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX)
+LUA_LIB?=lua$(LUA_SUFFIX)
+IDN_LIB?=idn
+OPENSSL_LIB?=crypto
+CC?=gcc
+CXX?=g++
+LD?=gcc
 
-IDN_LIB=idn
-OPENSSL_LIB=ssl
+.SUFFIXES: .c .o .so
 
-all: encodings.so hashes.so
-	
+encodings.o:
+	$(CXX) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.cpp
 
-install: encodings.so hashes.so
-	strip *.so
-	cp *.so ../util/
-	
+encodings.so: encodings.o
+	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+	$(CXX) $(LDFLAGS) $(IDNA_LIBS) -o encodings.so encodings.o -lcrypto
 
-clean:
-	rm *.so
+.c.o:
+	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $<
+
+.o.so:
+	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+	$(LD) $(LDFLAGS) -o $@ $< -lidn -lcrypto
 
-encodings.so: encodings.c
-	gcc -shared encodings.c -I$(LUA_INCLUDE) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so
+all: encodings.so hashes.so pposix.so signal.so
 
-hashes.so: hashes.c
-	gcc -shared hashes.c -I$(LUA_INCLUDE) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so
-	
+install: encodings.so hashes.so pposix.so signal.so
+	install *.so ../util/
+
+clean:
+	rm -f *.o
+	rm -f *.so
+	rm -f ../util/*.so