Makefile: rework automatic version.h mangling
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Joe Doss <joe@solidadmin.com>
This commit is contained in:
parent
2d000809dd
commit
3bfe9c41ab
2 changed files with 7 additions and 9 deletions
14
src/Makefile
14
src/Makefile
|
@ -46,6 +46,10 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR)\""
|
|||
ifeq ($(DEBUG),yes)
|
||||
CFLAGS += -g
|
||||
endif
|
||||
GIT_VERSION := $(shell GIT_CEILING_DIRECTORIES="$(PWD)/../.." git describe --dirty 2>/dev/null)
|
||||
ifneq ($(GIT_VERSION),)
|
||||
CFLAGS += -D'WIREGUARD_TOOLS_VERSION="$(GIT_VERSION:v%=%)"'
|
||||
endif
|
||||
ifeq ($(PLATFORM),linux)
|
||||
LIBMNL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libmnl 2>/dev/null)
|
||||
LIBMNL_LDLIBS := $(shell $(PKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)
|
||||
|
@ -96,17 +100,9 @@ install: wg
|
|||
@[ "$(WITH_WGQUICK)" = "yes" -a "$(WITH_SYSTEMDUNITS)" = "yes" ] || exit 0; \
|
||||
install -v -d "$(DESTDIR)$(SYSTEMDUNITDIR)" && install -v -m 0644 systemd/wg-quick@.service "$(DESTDIR)$(SYSTEMDUNITDIR)/wg-quick@.service"
|
||||
|
||||
wg.o: version.h
|
||||
version.h:
|
||||
@export GIT_CEILING_DIRECTORIES="$(PWD)/../.." && \
|
||||
ver="#define WIREGUARD_TOOLS_VERSION \"$$(git describe --dirty 2>/dev/null)\"" && \
|
||||
[ "$$(cat version.h 2>/dev/null)" != "$$ver" ] && \
|
||||
echo "$$ver" > version.h && \
|
||||
git update-index --assume-unchanged version.h || true
|
||||
|
||||
check: clean
|
||||
scan-build --html-title=wireguard-tools -maxloop 100 --view --keep-going $(MAKE) wg
|
||||
|
||||
.PHONY: clean install version.h check
|
||||
.PHONY: clean install check
|
||||
|
||||
-include *.d
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
#ifndef WIREGUARD_TOOLS_VERSION
|
||||
#define WIREGUARD_TOOLS_VERSION "1.0.20191226"
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue