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

diff --git a/util-src/Makefile b/util-src/Makefile
index 06e72577..008a1934 100644
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -6,33 +6,32 @@ LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX)
 LUA_LIB?=lua$(LUA_SUFFIX)
 IDN_LIB?=idn
 OPENSSL_LIB?=crypto
+CC?=gcc
+CXX?=g++
+LD?=gcc
 
+.SUFFIXES: .c .o .so
 
+encodings.o:
+	$(CXX) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.cpp
 
-all: encodings.so hashes.so pposix.so
+encodings.so: encodings.o
+	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
+	$(CXX) $(LDFLAGS) $(IDNA_LIBS) -o encodings.so encodings.o -lcrypto
+
+.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
 
-install: encodings.so hashes.so pposix.so
+all: encodings.so hashes.so pposix.so signal.so
+
+install: encodings.so hashes.so pposix.so signal.so
 	install *.so ../util/
-	
 
 clean:
 	rm -f *.o
 	rm -f *.so
 	rm -f ../util/*.so
-
-encodings.o: encodings.c
-	gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
-encodings.so: encodings.o
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lidn
-	
-
-hashes.o: hashes.c
-	gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
-hashes.so: hashes.o
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto
-
-pposix.o: pposix.c
-	gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
-pposix.so: pposix.o
-	export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX)
-