From c266593ab733272fe27facfa093e866bd3448a0a Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnouten@bzzt.net>
Date: Sat, 26 Mar 2016 17:32:46 +0100
Subject: [PATCH] Don't repeat version settings in Makefile

---
 MakeApp.mk |  7 +------
 MakeLib.mk |  5 -----
 Makefile   | 17 ++++++++++-------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/MakeApp.mk b/MakeApp.mk
index 411d6b7..8f3b94c 100644
--- a/MakeApp.mk
+++ b/MakeApp.mk
@@ -1,7 +1,3 @@
-VERSION      := 0
-SUBVERSION   := 8
-MINORVERSION := 2-SNAPSHOT
-
 #prefix := /usr
 prefix := /usr/local
 
@@ -12,8 +8,7 @@ all: nethogs decpcap_test
 
 runtests: test
 	./test
-	
-	
+
 # nethogs_testsum
 
 CFLAGS?=-Wall -Wextra
diff --git a/MakeLib.mk b/MakeLib.mk
index c719eba..24d727b 100644
--- a/MakeLib.mk
+++ b/MakeLib.mk
@@ -1,7 +1,3 @@
-LIBVERSION      := 0
-LIBSUBVERSION   := 1
-LIBMINORVERSION := 0
-
 LIBRARY=libnethogs.so
 LIBNAME=$(LIBRARY).$(LIBVERSION).$(LIBSUBVERSION).$(LIBMINORVERSION)
 SO_NAME=$(LIBRARY).$(LIBVERSION)
@@ -114,4 +110,3 @@ clean:
 	rm -f libnethogs.a
 	mkdir -p $(ODIR)
 	rmdir -p --ignore-fail-on-non-empty $(ODIR)
-
diff --git a/Makefile b/Makefile
index 84a09bd..cf2e713 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
+export VERSION      := 0
+export SUBVERSION   := 8
+export MINORVERSION := 2-SNAPSHOT
+
 all: nethogs decpcap_test
 	$(MAKE) -f MakeApp.mk $@
 	$(MAKE) -f MakeLib.mk $@
 
 runtests: test
 	./test
-	
-.PHONY: tgz
+
+.PHONY:
 tgz: clean
 	cd .. ; tar czvf nethogs-$(VERSION).$(SUBVERSION).$(MINORVERSION).tar.gz --exclude-vcs nethogs/*
 
-.PHONY:
 check:
 	$(MAKE) -f MakeApp.mk $@
 
@@ -18,18 +21,18 @@ install:
 	$(MAKE) -f MakeLib.mk $@
 
 install_dev:
-	$(MAKE) -f MakeLib.mk $@ 
+	$(MAKE) -f MakeLib.mk $@
 
 uninstall:
 	$(MAKE) -f MakeApp.mk $@
 	$(MAKE) -f MakeLib.mk $@
-	 
+
 nethogs:
 	$(MAKE) -f MakeApp.mk $@
-	 
+
 decpcap_test:
 	$(MAKE) -f MakeApp.mk $@
-	 
+
 clean:
 	$(MAKE) -f MakeApp.mk $@
 	$(MAKE) -f MakeLib.mk $@