summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-08-28 14:05:01 -0500
committerJeff Carr <[email protected]>2025-08-28 19:30:59 -0500
commitc193af11e7f2d32b336127e123e496c5c16915e3 (patch)
tree85242b84379882a3e8b0aa03250a8c88046b1517 /Makefile
parent6b6b31eef6f6a636db0750fcd0d59e3e0758013e (diff)
try merging patches together
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c0a9114..6b9c77b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,8 @@ VERSION = $(shell git describe --tags)
BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
all: install
- forged pull
- # ./forged list
- forged list
+ forged merge
+ # forged list
build: goimports
GO111MODULE=off go build \
@@ -16,7 +15,7 @@ verbose:
GO111MODULE=off go build -v -x \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
-install:
+install: goimports
GO111MODULE=off go install \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"