Merge 0.9->0.10

[prosody.git] / util-src / Makefile

diff --git a/util-src/Makefile b/util-src/Makefile
index c71e06b41c995c63c46804a110c622e7d1d81f64..5f35b81b72f139da6d5d2d985f22e782bdb0a6d0 100644 (file)
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -1,14 +1,6 @@
 
 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)
 
 INSTALL_DATA=install -m644
@@ -27,11 +19,9 @@ install: $(ALL)
 clean:
        rm -f $(ALL)
 
-encodings.so: encodings.o
-       $(CC) -o $@ $< $(LDFLAGS) $(IDNA_LIBS)
+encodings.so: LDLIBS+=$(IDNA_LIBS)
 
-hashes.so: hashes.o
-       $(CC) -o $@ $< $(LDFLAGS) -l$(OPENSSL_LIB)
+hashes.so: LDLIBS+=$(OPENSSL_LIBS)
 
 %.so: %.o
        $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)