X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util-src%2FMakefile;h=9c6c377c14a56fd4816729ebf4f45b77a9e5e17f;hb=2a8a192c7c5ff4c13370adab7fbe1c926f45b01d;hp=4aedec401756a484eb384a4d4de11d47044c41d1;hpb=77303f2d87d7127a53b33c5942ed228726f52a94;p=prosody.git

diff --git a/util-src/Makefile b/util-src/Makefile
index 4aedec40..9c6c377c 100644
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -1,32 +1,34 @@
 
 include ../config.unix
 
-LUA_SUFFIX?=5.1
-LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX)
-LUA_LIB?=lua$(LUA_SUFFIX)
-IDN_LIB?=idn
-OPENSSL_LIB?=crypto
+CFLAGS+=-ggdb -Wall -pedantic -I$(LUA_INCDIR)
 
+INSTALL_DATA=install -m644
+TARGET?=../util/
 
+ALL=encodings.so hashes.so net.so pposix.so signal.so table.so ringbuffer.so
 
-all: encodings.so hashes.so
+ifdef RANDOM
+ALL+=crand.so
+endif
 
-install: encodings.so hashes.so
-	install *.so ../util/
-	
+.PHONY: all install clean
+.SUFFIXES: .c .o .so
+
+all: $(ALL)
+
+install: $(ALL)
+	$(INSTALL_DATA) $^ $(TARGET)
 
 clean:
-	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) -lcrypto -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 -lssl
-	
+	rm -f $(ALL) $(patsubst %.so,%.o,$(ALL))
+
+encodings.so: LDLIBS+=$(IDNA_LIBS)
+
+hashes.so: LDLIBS+=$(OPENSSL_LIBS)
+
+crand.o: CFLAGS+=-DWITH_$(RANDOM)
+crand.so: LDLIBS+=$(RANDOM_LIBS)
+
+%.so: %.o
+	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)