diff --git a/Makefile b/Makefile index 674785b..fdaa7c1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ PACKAGE = gitlab.weird-web-workers.org/golang/test -SOURCES = version.go +SOURCES = version.go \ + server.go \ + signal.go VERSION = 0.0.1 REVISION = $(shell git rev-parse HEAD) @@ -19,14 +21,14 @@ $(LIBRARY): $(SOURCES) go install $(PACKAGE) .version: - -@printf "%s\n%s\n%s" \ - "$(VERSION)" "$(REVISION)" "$(BUILDTIME)" >$@.new + -@printf "%s\n%s\n%s" "$(VERSION)" "$(REVISION)" >$@.new -@diff $@ $@.new >/dev/null 2>&1 && rm $@.new || mv $@.new $@ version.go: version.go.m4 .version -@m4 -Dm4_version=$(VERSION) \ -Dm4_revision=$(REVISION) \ -Dm4_build_time=$(BUILDTIME) \ + -Dm4_package=$(PACKAGE) \ $< >$@ clean: diff --git a/version.go.m4 b/version.go.m4 index e42dd3d..d91960a 100644 --- a/version.go.m4 +++ b/version.go.m4 @@ -24,10 +24,17 @@ along with this program. If not, see . */ package test -const ( - VERSION = "m4_version" - REVISION = "m4_revision" - BUILD_TIME = "m4_build_time" +import ( + "gitlab.weird-web-workers.org/golang/version" +) + +var ( + VERSION = version.Version{ + Package: "m4_package", + Version: "m4_version", + Revision: "m4_revision", + BuildTime: "m4_build_time", + } ) // vim: ts=4 sts=4 sw=4 noet tw=72: