X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util-src%2FMakefile;h=2c8243f90512738e9fad37c0d45f7586b50c74c6;hb=a7cfce449708f1619f15089b39996b2013b075d1;hp=6cee457bbab41c72da6772daa9eb644dcc319d4f;hpb=8f1869913884a9224a17f73d6b74134354d6a8c4;p=prosody.git

diff --git a/util-src/Makefile b/util-src/Makefile
index 6cee457b..2c8243f9 100644
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -7,45 +7,34 @@ LUA_LIB?=lua$(LUA_SUFFIX)
 IDN_LIB?=idn
 OPENSSL_LIB?=crypto
 CC?=gcc
+CXX?=g++
 LD?=gcc
 
+.PHONY: all install clean
+.SUFFIXES: .c .o .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
-	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c
 encodings.so: encodings.o
 	MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
-	$(LD) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn
-	
+	$(CC) -o $@ $< $(LDFLAGS) $(IDNA_LIBS)
 
-hashes.o: hashes.c
-	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
 hashes.so: hashes.o
-	MACOSX_DEPLOYMENT_TARGET="10.3";
-	export MACOSX_DEPLOYMENT_TARGET;
-	$(LD) $(LFLAGS) -o hashes.so hashes.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lcrypto
-
-pposix.o: pposix.c
-	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c
-pposix.so: pposix.o
-	MACOSX_DEPLOYMENT_TARGET="10.3";
-	export MACOSX_DEPLOYMENT_TARGET;
-	$(LD) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
-	
-lsignal.o: lsignal.c
-	$(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o lsignal.o lsignal.c
-signal.so: lsignal.o
-	MACOSX_DEPLOYMENT_TARGET="10.3";
-	export MACOSX_DEPLOYMENT_TARGET;
-	$(LD) $(LFLAGS) -o signal.so lsignal.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
-	
+	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)
+