fix buildv0.22.9v0.22.8v0.22.7v0.22.6v0.22.5v0.22.4v0.22.3v0.22.2v0.22.12v0.22.11v0.22.10

1 files changed, 21 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 9e0848d..fde876f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,35 @@
-# export GO111MODULE="off"
-run: build
-	reset
-	# ./control-panel-droplet --debugger
+VERSION = $(shell git describe --tags)
+BUILDTIME = $(shell date +%Y.%m.%d)
+
+all: build
 	./control-panel-droplet
 
-redomod:
-	rm -f go.*
-	GO111MODULE= go mod init
-	GO111MODULE= go mod tidy
+build:
+	GO111MODULE=off go build \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
+verbose:
+	GO111MODULE=off go build -v -x \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-build-release:
-	GO111MODULE=off go get -v -u -x .
-	GO111MODULE=off go build -v
-	./control-panel-droplet
+install:
+	GO111MODULE=off go install \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-build:
-	GO111MODULE=off go get -v -x .
-	GO111MODULE=off go build -v
+clean:
+	-rm -f control-panel-droplet
 
-update:
-	go get -v -u -x .
+redomod:
+	rm -f go.*
+	GO111MODULE= go mod init
+	GO111MODULE= go mod tidy
 
-log:
-	reset
-	tail -f /tmp/witgui.* /tmp/guilogfile
 
 gocui: build
-	./control-panel-droplet -gui gocui >/tmp/control-panel-droplet 2>&1
+	./control-panel-droplet -gui gocui
 
 quiet:
-	./control-panel-droplet >/tmp/witgui.log.stderr 2>&1
+	./control-panel-droplet
 
 github:
 	@echo "IPv6 only. Do not mirror on github"