Comparison

Makefile @ 7074:3ff83773ffc0

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 10 Jan 2016 03:57:17 +0100
parent 7071:d9e620adfb64
child 7165:f0e6757261bc
comparison
equal deleted inserted replaced
7063:bc1b375f379e 7074:3ff83773ffc0
50 rm -f prosodyctl.install 50 rm -f prosodyctl.install
51 rm -f prosody.cfg.lua.install 51 rm -f prosody.cfg.lua.install
52 rm -f prosody.version 52 rm -f prosody.version
53 $(MAKE) clean -C util-src 53 $(MAKE) clean -C util-src
54 54
55 test:
56 cd tests && ./run_tests.sh
57
55 util/%.so: 58 util/%.so:
56 $(MAKE) install -C util-src 59 $(MAKE) install -C util-src
57 60
58 %.install: % 61 %.install: %
59 sed "1s| lua$$| $(RUNWITH)|; \ 62 sed "1s| lua$$| $(RUNWITH)|; \