From 4c87a12e946912a4ed4c2921d8867b5668544dd5 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Tue, 30 Dec 2025 10:30:06 -0500 Subject: [PATCH] Fix Makefile now that multiple cmds are built --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f41b9d7..db55fdc 100644 --- a/Makefile +++ b/Makefile @@ -3,29 +3,33 @@ all: coverage linux mac DIRTY=$(shell test -z "`git status --untracked-files=no --porcelain`" || echo "-dirty") GITHASH=$(shell git log --pretty='%H' -1) -LDFLAG=-ldflags "-X 'src.bluestatic.org/mailpopbox/pkg/version.versionGit=$(GITHASH)$(DIRTY)'" +LDFLAG=-o build -ldflags "-X 'src.bluestatic.org/mailpopbox/pkg/version.versionGit=$(GITHASH)$(DIRTY)'" VERSION=$(shell sed -n -E -e 's/[[:space:]]*versionNumber = "(.*)"/\1/p' pkg/version/version.go) PKG_BASE=mailpopbox-$(VERSION) DOCS_FILES=README.md docs/install.md +clean: + rm -rf build || true + mkdir build + coverage: go test -coverprofile ./cover.out ./... go tool cover -html=cover.out -o cover.html -mac: +mac: clean GOOS=darwin GOARCH=amd64 go build $(LDFLAG) ./cmd/... mkdir $(PKG_BASE) - cp mailpopbox $(PKG_BASE) + cp build/mailpopbox $(PKG_BASE) cp $(DOCS_FILES) $(PKG_BASE) zip -r $(PKG_BASE)-mac-amd64.zip $(PKG_BASE) rm -rf $(PKG_BASE) -linux: +linux: clean GOOS=linux GOARCH=amd64 go build $(LDFLAG) ./cmd/... mkdir $(PKG_BASE) - cp mailpopbox $(PKG_BASE) + cp build/mailpopbox $(PKG_BASE) cp deployment/mailpopbox.service $(PKG_BASE) cp $(DOCS_FILES) $(PKG_BASE) zip -r $(PKG_BASE)-linux-amd64.zip $(PKG_BASE) -- 2.43.5