Don't repeat version settings in Makefile

This commit is contained in:
Arnout Engelen
2016-03-26 17:32:46 +01:00
parent 848dfd44ff
commit c266593ab7
3 changed files with 11 additions and 18 deletions

View File

@@ -1,7 +1,3 @@
VERSION := 0
SUBVERSION := 8
MINORVERSION := 2-SNAPSHOT
#prefix := /usr
prefix := /usr/local
@@ -13,7 +9,6 @@ all: nethogs decpcap_test
runtests: test
./test
# nethogs_testsum
CFLAGS?=-Wall -Wextra

View File

@@ -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)

View File

@@ -1,3 +1,7 @@
export VERSION := 0
export SUBVERSION := 8
export MINORVERSION := 2-SNAPSHOT
all: nethogs decpcap_test
$(MAKE) -f MakeApp.mk $@
$(MAKE) -f MakeLib.mk $@
@@ -5,11 +9,10 @@ all: nethogs decpcap_test
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 $@