Merge 0.10->trunk

[prosody.git] / util-src / Makefile

diff --git a/util-src/Makefile b/util-src/Makefile
index 4058b59da15e71c55f94277237ae3b7e3f23a309..9c6c377c14a56fd4816729ebf4f45b77a9e5e17f 100644 (file)
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -1,39 +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
-CC?=gcc
-LD?=gcc
+CFLAGS+=-ggdb -Wall -pedantic -I$(LUA_INCDIR)
 
+INSTALL_DATA=install -m644
+TARGET?=../util/
 
-all: encodings.so hashes.so pposix.so
+ALL=encodings.so hashes.so net.so pposix.so signal.so table.so ringbuffer.so
 
-install: encodings.so hashes.so pposix.so
-       install *.so ../util/
-       
+ifdef RANDOM
+ALL+=crand.so
+endif
+
+.PHONY: all install clean
+.SUFFIXES: .c .o .so
+
+all: $(ALL)
+
+install: $(ALL)
+       $(INSTALL_DATA) $^ $(TARGET)
 
 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
-       export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn
-       
-
-hashes.o: hashes.c
-       $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c
-hashes.so: hashes.o
-       export MACOSX_DEPLOYMENT_TARGET="10.3"; $(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
-       export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
-       
+       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)