Don't repeat version settings in Makefile
This commit is contained in:
@@ -1,7 +1,3 @@
|
|||||||
VERSION := 0
|
|
||||||
SUBVERSION := 8
|
|
||||||
MINORVERSION := 2-SNAPSHOT
|
|
||||||
|
|
||||||
#prefix := /usr
|
#prefix := /usr
|
||||||
prefix := /usr/local
|
prefix := /usr/local
|
||||||
|
|
||||||
@@ -12,8 +8,7 @@ all: nethogs decpcap_test
|
|||||||
|
|
||||||
runtests: test
|
runtests: test
|
||||||
./test
|
./test
|
||||||
|
|
||||||
|
|
||||||
# nethogs_testsum
|
# nethogs_testsum
|
||||||
|
|
||||||
CFLAGS?=-Wall -Wextra
|
CFLAGS?=-Wall -Wextra
|
||||||
|
|||||||
@@ -1,7 +1,3 @@
|
|||||||
LIBVERSION := 0
|
|
||||||
LIBSUBVERSION := 1
|
|
||||||
LIBMINORVERSION := 0
|
|
||||||
|
|
||||||
LIBRARY=libnethogs.so
|
LIBRARY=libnethogs.so
|
||||||
LIBNAME=$(LIBRARY).$(LIBVERSION).$(LIBSUBVERSION).$(LIBMINORVERSION)
|
LIBNAME=$(LIBRARY).$(LIBVERSION).$(LIBSUBVERSION).$(LIBMINORVERSION)
|
||||||
SO_NAME=$(LIBRARY).$(LIBVERSION)
|
SO_NAME=$(LIBRARY).$(LIBVERSION)
|
||||||
@@ -114,4 +110,3 @@ clean:
|
|||||||
rm -f libnethogs.a
|
rm -f libnethogs.a
|
||||||
mkdir -p $(ODIR)
|
mkdir -p $(ODIR)
|
||||||
rmdir -p --ignore-fail-on-non-empty $(ODIR)
|
rmdir -p --ignore-fail-on-non-empty $(ODIR)
|
||||||
|
|
||||||
|
|||||||
17
Makefile
17
Makefile
@@ -1,15 +1,18 @@
|
|||||||
|
export VERSION := 0
|
||||||
|
export SUBVERSION := 8
|
||||||
|
export MINORVERSION := 2-SNAPSHOT
|
||||||
|
|
||||||
all: nethogs decpcap_test
|
all: nethogs decpcap_test
|
||||||
$(MAKE) -f MakeApp.mk $@
|
$(MAKE) -f MakeApp.mk $@
|
||||||
$(MAKE) -f MakeLib.mk $@
|
$(MAKE) -f MakeLib.mk $@
|
||||||
|
|
||||||
runtests: test
|
runtests: test
|
||||||
./test
|
./test
|
||||||
|
|
||||||
.PHONY: tgz
|
.PHONY:
|
||||||
tgz: clean
|
tgz: clean
|
||||||
cd .. ; tar czvf nethogs-$(VERSION).$(SUBVERSION).$(MINORVERSION).tar.gz --exclude-vcs nethogs/*
|
cd .. ; tar czvf nethogs-$(VERSION).$(SUBVERSION).$(MINORVERSION).tar.gz --exclude-vcs nethogs/*
|
||||||
|
|
||||||
.PHONY:
|
|
||||||
check:
|
check:
|
||||||
$(MAKE) -f MakeApp.mk $@
|
$(MAKE) -f MakeApp.mk $@
|
||||||
|
|
||||||
@@ -18,18 +21,18 @@ install:
|
|||||||
$(MAKE) -f MakeLib.mk $@
|
$(MAKE) -f MakeLib.mk $@
|
||||||
|
|
||||||
install_dev:
|
install_dev:
|
||||||
$(MAKE) -f MakeLib.mk $@
|
$(MAKE) -f MakeLib.mk $@
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
$(MAKE) -f MakeApp.mk $@
|
$(MAKE) -f MakeApp.mk $@
|
||||||
$(MAKE) -f MakeLib.mk $@
|
$(MAKE) -f MakeLib.mk $@
|
||||||
|
|
||||||
nethogs:
|
nethogs:
|
||||||
$(MAKE) -f MakeApp.mk $@
|
$(MAKE) -f MakeApp.mk $@
|
||||||
|
|
||||||
decpcap_test:
|
decpcap_test:
|
||||||
$(MAKE) -f MakeApp.mk $@
|
$(MAKE) -f MakeApp.mk $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(MAKE) -f MakeApp.mk $@
|
$(MAKE) -f MakeApp.mk $@
|
||||||
$(MAKE) -f MakeLib.mk $@
|
$(MAKE) -f MakeLib.mk $@
|
||||||
|
|||||||
Reference in New Issue
Block a user