aboutsummaryrefslogtreecommitdiffstats
path: root/util-src
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-27 00:37:18 +0200
committerKim Alvefur <zash@zash.se>2015-09-27 00:37:18 +0200
commit3fc78cf2154d9a870763a06801bd167ddabf1c61 (patch)
tree2e6a296aac1eb2dbf8f40a56235d32870b270b99 /util-src
parenta8ff283e3d24ebdd007050e37106ac786af2eaee (diff)
parent23fa3312e7d966a9205274189eb6b5d0d793c3be (diff)
downloadprosody-3fc78cf2154d9a870763a06801bd167ddabf1c61.tar.gz
prosody-3fc78cf2154d9a870763a06801bd167ddabf1c61.zip
Merge 0.10->trunk
Diffstat (limited to 'util-src')
-rw-r--r--util-src/Makefile42
1 files changed, 14 insertions, 28 deletions
diff --git a/util-src/Makefile b/util-src/Makefile
index 3674975c..5f35b81b 100644
--- a/util-src/Makefile
+++ b/util-src/Makefile
@@ -1,41 +1,27 @@
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
+CFLAGS+=-ggdb -I$(LUA_INCDIR)
+
+INSTALL_DATA=install -m644
+TARGET?=../util/
+
+ALL=encodings.so hashes.so net.so pposix.so signal.so table.so
.PHONY: all install clean
.SUFFIXES: .c .o .so
-all: encodings.so hashes.so net.so pposix.so signal.so table.so
+all: $(ALL)
-install: encodings.so hashes.so net.so pposix.so signal.so table.so
- install *.so ../util/
+install: $(ALL)
+ $(INSTALL_DATA) $^ $(TARGET)
clean:
- rm -f *.o
- rm -f *.so
- rm -f ../util/*.so
-
-encodings.so: encodings.o
- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
- $(CC) -o $@ $< $(LDFLAGS) $(IDNA_LIBS)
-
-hashes.so: hashes.o
- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
- $(CC) -o $@ $< $(LDFLAGS) -l$(OPENSSL_LIB)
+ rm -f $(ALL)
-.c.o:
- $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $<
+encodings.so: LDLIBS+=$(IDNA_LIBS)
-.o.so:
- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET;
- $(LD) -o $@ $< $(LDFLAGS)
+hashes.so: LDLIBS+=$(OPENSSL_LIBS)
+%.so: %.o
+ $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)