util.json: Added function encode_ordered(object).

[prosody.git] / Makefile

diff --git a/Makefile b/Makefile
index 4090d554336b46cddeffc63423452e077bac2602..0fa8b28eeb4ead9465017b46f32327e5d9fa6919 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,8 @@ INSTALLEDCONFIG = $(SYSCONFDIR)
 INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
+.PHONY: all clean install
+
 all: prosody.install prosodyctl.install prosody.cfg.lua.install prosody.version
        $(MAKE) -C util-src install
 
@@ -34,7 +36,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
        install -d $(MODULES)/muc
        install -m644 plugins/muc/* $(MODULES)/muc
        install -m644 certs/* $(CONFIG)/certs
-       install -m644 plugins/*.lua $(MODULES)
+       install -d $(MODULES)/adhoc
+       install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
        install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
        test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
        test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
@@ -47,36 +50,20 @@ clean:
        rm -f prosody.version
        $(MAKE) clean -C util-src
 
-util/encodings.so:
-       $(MAKE) install -C util-src
-
-util/hashes.so:
+util/%.so:
        $(MAKE) install -C util-src
 
-util/pposix.so:
-       $(MAKE) install -C util-src
-
-util/signal.so:
-       $(MAKE) install -C util-src
-
-prosody.install: prosody
-       sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
-               s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
-               s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
-               s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosody > prosody.install
-
-prosodyctl.install: prosodyctl
+%.install: %
        sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
                s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
                s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
-               s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < prosodyctl > prosodyctl.install
-
-prosody.cfg.lua.install:
-       sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install
+               s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < $^ > $@
 
-prosody.release:
-       test -e .hg/dirstate && hexdump -n6 -e'6/1 "%02x"' .hg/dirstate \
-           > prosody.version || true
+prosody.cfg.lua.install: prosody.cfg.lua.dist
+       sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' $^ > $@
 
-prosody.version: prosody.release
-       cp prosody.release prosody.version || true
+prosody.version: $(wildcard prosody.release .hg/dirstate)
+       test -e .hg/dirstate && \
+               hexdump -n6 -e'6/1 "%02x"' .hg/dirstate > $@ || true
+       test -f prosody.release && \
+               cp prosody.release $@ || true