Merge 0.10->trunk

[prosody.git] / util-src / Makefile

diff --git a/util-src/Makefile b/util-src/Makefile
index f35c20bcb9114ea15119551e778440ae74a74456..9c6c377c14a56fd4816729ebf4f45b77a9e5e17f 100644 (file)
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -1,20 +1,16 @@
 
 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
-CC?=gcc
-CXX?=g++
-LD?=gcc
-CFLAGS+=-ggdb -I$(LUA_INCDIR)
+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
+ALL=encodings.so hashes.so net.so pposix.so signal.so table.so ringbuffer.so
+
+ifdef RANDOM
+ALL+=crand.so
+endif
 
 .PHONY: all install clean
 .SUFFIXES: .c .o .so
@@ -25,11 +21,14 @@ install: $(ALL)
        $(INSTALL_DATA) $^ $(TARGET)
 
 clean:
-       rm -f $(ALL)
+       rm -f $(ALL) $(patsubst %.so,%.o,$(ALL))
 
 encodings.so: LDLIBS+=$(IDNA_LIBS)
 
-hashes.so: LDLIBS+=-l$(OPENSSL_LIB)
+hashes.so: LDLIBS+=$(OPENSSL_LIBS)
+
+crand.o: CFLAGS+=-DWITH_$(RANDOM)
+crand.so: LDLIBS+=$(RANDOM_LIBS)
 
 %.so: %.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)