irkerd: Replace 'password' global with local Connection.password

[irker.git] / Makefile

diff --git a/Makefile b/Makefile
index 59fe7f2369e070883e92cc5982a6a745013347d6..db16e00b569bc9e07588db7ba7796a3a6e08ffc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,99 @@
-# Makefile for the irker relaying tool
+# Makefile for the irker relaying daemon
 
-VERS=$(shell irker.py -V | sed 's/irker version //')
+VERS := $(shell sed -n 's/version = "\(.\+\)"/\1/p' irkerd)
+SYSTEMDSYSTEMUNITDIR := $(shell pkg-config --variable=systemdsystemunitdir systemd)
 
-docs: irker.html irker.1
+# `prefix`, `mandir` & `DESTDIR` can and should be set on the command
+# line to control installation locations
+prefix ?= /usr
+mandir ?= /share/man
+target = $(DESTDIR)$(prefix)
 
-irker.1: irker.xml
-       xmlto man irker.xml
-irker.html: irker.xml
-       xmlto html-nochunks irker.xml
+docs: irkerd.html irkerd.8 irkerhook.html irkerhook.1
 
-install: irker.1 uninstall
-       install -m 755 -o 0 -g 0 -d $(ROOT)/usr/bin/
-       install -m 755 -o 0 -g 0 irker.py $(ROOT)/usr/bin/irker.py
-       install -m 755 -o 0 -g 0 -d $(ROOT)/usr/share/man/man1/
-       install -m 755 -o 0 -g 0 irker.1 $(ROOT)/usr/share/man/man1/irker.1
+irkerd.8: irkerd.xml
+       xmlto man irkerd.xml
+irkerd.html: irkerd.xml
+       xmlto html-nochunks irkerd.xml
+
+irkerhook.1: irkerhook.xml
+       xmlto man irkerhook.xml
+irkerhook.html: irkerhook.xml
+       xmlto html-nochunks irkerhook.xml
+
+install.html: install.txt
+       asciidoc -o install.html install.txt
+security.html: security.txt
+       asciidoc -o security.html security.txt
+hacking.html: hacking.txt
+       asciidoc -o hacking.html hacking.txt
+
+install: irkerd.8 irkerhook.1 uninstall
+       install -m 755 -o 0 -g 0 -d "$(target)/bin"
+       install -m 755 -o 0 -g 0 irkerd "$(target)/bin/irkerd"
+ifneq ($(strip $(SYSTEMDSYSTEMUNITDIR)),)
+       install -m 755 -o 0 -g 0 -d "$(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)"
+       install -m 644 -o 0 -g 0 irkerd.service "$(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)"
+endif
+       install -m 755 -o 0 -g 0 -d "$(target)$(mandir)/man8"
+       install -m 755 -o 0 -g 0 irkerd.8 "$(target)$(mandir)/man8/irkerd.8"
+       install -m 755 -o 0 -g 0 -d "$(target)$(mandir)/man1"
+       install -m 755 -o 0 -g 0 irkerhook.1 "$(target)$(mandir)/man1/irkerhook.1"
 
 uninstall:
-       rm -f ${ROOT}/usr/bin/irker.py ${ROOT}/usr/share/man/man1/irker.1
+       rm -f "$(target)/bin/irkerd"
+ifneq ($(strip $(SYSTEMDSYSTEMUNITDIR)),)
+       rm -f "$(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)/irkerd.service"
+endif
+       rm -f "$(target)$(mandir)/man8/irkerd.8"
+       rm -f "$(target)$(mandir)/man1/irkerhook.1"
 
 clean:
-       rm -f irker irker.1 irker-*.rpm irker-*.tar.gz *~
-       rm -f SHIPPER.* *.html
+       rm -f irkerd.8 irkerhook.1 irker-*.tar.gz *~ *.html
 
-PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902,R0903,E1101"
+PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301,R0201,R0902,R0903,R0912,R0913,R0914,R0915,E1101,W0201,W0212,W0621,W0702,F0401"
 pylint:
-       @pylint --output-format=parseable $(PYLINTOPTS) irker.py
+       @pylint --output-format=parseable $(PYLINTOPTS) irkerd
+       @pylint --output-format=parseable $(PYLINTOPTS) irkerhook.py
+
+loc:
+       @echo "LOC:"; wc -l irkerd irkerhook.py
+       @echo -n "LLOC: "; grep -vE '(^ *#|^ *$$)' irkerd irkerhook.py | wc -l
+
+DOCS = \
+       README \
+       COPYING \
+       NEWS \
+       install.txt \
+       security.txt \
+       hacking.txt \
+       irkerhook.xml \
+       irkerd.xml \
 
+SOURCES = \
+       $(DOCS) \
+       irkerd \
+       irkerhook.py \
+       filter-example.py \
+       filter-test.py \
+       irk \
+       Makefile
 
-SOURCES = README COPYING NEWS irker.py Makefile irker.xml irker-logo.jpg
+EXTRA_DIST = \
+       org.catb.irkerd.plist \
+       irkerd.service \
+       irker-logo.png
 
 version:
        @echo $(VERS)
 
-irker-$(VERS).tar.gz: $(SOURCES) irker.1
-       @ls $(SOURCES) irker.1 | sed s:^:irker-$(VERS)/: >MANIFEST
-       @(cd ..; ln -s irker irker-$(VERS))
-       (cd ..; tar -czf irker/irker-$(VERS).tar.gz `cat irker/MANIFEST`)
-       @(cd ..; rm irker-$(VERS))
+irker-$(VERS).tar.gz: $(SOURCES) irkerd.8 irkerhook.1
+       mkdir irker-$(VERS)
+       cp -pR $(SOURCES) $(EXTRA_DIST) irker-$(VERS)/
+       @COPYFILE_DISABLE=1 tar -cvzf irker-$(VERS).tar.gz irker-$(VERS)
+       rm -fr irker-$(VERS)
 
 dist: irker-$(VERS).tar.gz
 
-release: irker-$(VERS).tar.gz irker.html
-       shipper -u -m -t; make clean
+release: irker-$(VERS).tar.gz irkerd.html irkerhook.html install.html security.html hacking.html
+       shipper version=$(VERS) | sh -e -x