All of my changes

.gitignore

@@ -30,3 +30,9 @@
 
 # tuntox related, not needed in repo
 tuntox
+tuntox_nostatic
+debian/debhelper-build-stamp
+debian/files
+debian/tuntox.substvars
+gitversion.h
+*.deb

Makefile

@@ -1,51 +1,80 @@
-SOURCES = $(wildcard *.c)
-DEPS=toxcore
-CC=gcc
-CFLAGS=-g -Wall #-std=c99
+SOURCES = client.c gitversion.c log.c mach.c main.c util.c
+OBJECTS = $(SOURCES:.c=.o)
+SCRIPTS = scripts/tokssh scripts/toxish
+EXECUTABLES = tuntox tuntox_nostatic
+DEB_VERSION = 0.0.9-1
+DEB_ARCH = amd64
+DEBS = ../tuntox_$(DEB_VERSION)_$(DEB_ARCH).deb ../tuntox-dbgsym_$(DEB_VERSION)_$(DEB_ARCH).deb
+INCLUDES = client.h gitversion.h log.h mach.h main.h tox_bootstrap.h utarray.h uthash.h util.h utlist.h utstring.h
+DEPS = toxcore
+CC = gcc
+CFLAGS = -g -W -Wall -O2 -fcompare-debug-second
 CFLAGS += $(shell pkg-config --cflags $(DEPS))
-LDFLAGS=-g -pthread -lm -static -lrt
+LDFLAGS = -g -pthread -lm -static -lrt
 LDFLAGS += $(shell pkg-config --static --libs $(DEPS))
-DSO_LDFLAGS=-g -pthread -lm -lrt
+DSO_LDFLAGS = -g -pthread -lm -lrt
 DSO_LDFLAGS += $(shell pkg-config --libs $(DEPS))
-OBJECTS=$(SOURCES:.c=.o)
-INCLUDES = $(wildcard *.h)
 PYTHON = /usr/bin/env python3
 INSTALL = install -C
 INSTALL_MKDIR = $(INSTALL) -d -m 755
 
-prefix ?= /usr
-bindir ?= $(prefix)/bin
+prefix = /usr
+bindir = $(prefix)/bin
+etcdir = /etc
 
 # Targets
-all: tuntox tuntox_nostatic
+.PHONY: all clean
+all: $(EXECUTABLES)
 
-gitversion.h: FORCE
-	@if [ -f .git/HEAD ] ; then echo "  GEN   $@"; echo "#define GITVERSION \"$(shell git rev-parse HEAD)\"" > $@; fi
+gitversion != printf %s $$(git rev-parse HEAD) && (git diff --quiet || printf %s -dirty)
+gitversion_on_disk != 2>/dev/null read _ _ v < gitversion.h && echo $$v || true
+ifneq ("$(gitversion)", $(gitversion_on_disk))
+.PHONY: gitversion.h
+endif
 
-FORCE:
+gitversion.h:
+	@echo "  GEN   $@"
+	@echo '#define GITVERSION "$(gitversion)"' > $@
 
-tox_bootstrap.h: 
-	$(PYTHON) generate_tox_bootstrap.py 
+tox_bootstrap.h:
+	$(PYTHON) generate_tox_bootstrap.py
 
 %.o: %.c $(INCLUDES) gitversion.h tox_bootstrap.h
 	@echo "  CC    $@"
 	@$(CC) -c $(CFLAGS) $< -o $@
 
 tuntox: $(OBJECTS) $(INCLUDES)
-	$(CC) -o $@ $(OBJECTS) -lpthread $(LDFLAGS) 
+	$(CC) -o $@ $(OBJECTS) -lpthread $(LDFLAGS)
 
 tuntox_nostatic: $(OBJECTS) $(INCLUDES)
-	$(CC) -o $@ $(OBJECTS) -lpthread $(DSO_LDFLAGS) 
+	$(CC) -o $@ $(OBJECTS) -lpthread $(DSO_LDFLAGS)
 
 cscope.out:
 	@echo "  GEN   $@"
 	@cscope -bv ./*.[ch] &> /dev/null
 
 clean:
-	rm -f *.o tuntox cscope.out gitversion.h tox_bootstrap.h
+	rm -f $(OBJECTS) $(EXECUTABLES) cscope.out gitversion.h
 
+ifneq ($(shell id -u),0)
+install:
+	sudo MAKEFLAGS=$(MAKEFLAGS) -- $(MAKE) install
+else
 install: tuntox_nostatic
-	$(INSTALL_MKDIR) -d $(DESTDIR)$(bindir)
-	cp tuntox_nostatic $(DESTDIR)$(bindir)/tuntox
+	install -d -m755 $(DESTDIR)$(bindir) $(DESTDIR)$(etcdir)
+	install -d -m700 $(DESTDIR)$(etcdir)/tuntox
+	install -D -T tuntox_nostatic $(DESTDIR)$(bindir)/tuntox
+	install -D -t $(DESTDIR)$(bindir) $(SCRIPTS)
+	install -m0644 -D -t $(DESTDIR)$(etcdir)/systemd/system scripts/tuntox.service
+ifeq ($(SKIP_SYSTEMCTL),)
+	systemctl daemon-reload
+	systemctl restart tuntox
+	systemctl status tuntox
+endif
+endif
 
-.PHONY: all clean tuntox
+.PHONY: install-debs debs
+install-debs: debs
+	$(shell [ "$$(id -u)" = 0 ] || echo sudo) dpkg -i $(DEBS)
+$(DEBS) debs:
+	fakeroot -- sh -c 'SKIP_SYSTEMCTL=y ./debian/rules binary'