Cleanup Makefile

1 files changed, 25 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 6baad7f..a0196b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,20 @@
 IMAGE=docker.crute.me/ssh-proxy
-BINARY=ssh-proxy
-CLIENT_BINARY=ssh-proxy-client
+SERVER_BINARY=ssh-proxy
+CLIENT_BINARY=client
 
-$(BINARY): $(CLIENT_BINARY) $(shell find . -name '*.go' -o -name '*.tpl' -o -name '*.js')
-        @[ "$(CLIENT_ID)" ] || ( echo "CLIENT_ID must be set"; exit 1 )
+SERVER_FILES := $(shell find . -name '*.go' -o -name '*.tpl' -o -name '*.js')
+CLIENT_FILES := $(shell find . -name '*.go')
 
+$(SERVER_BINARY): $(SERVER_FILES)
+        @mkdir clients/ || true
+        @touch clients/keep
         CGO_ENABLED=0 go build \
                 -ldflags "-X main.appVersion=$(shell git describe --long --tags --dirty --always) \
                                   -X code.crute.us/mcrute/ssh-proxy/cmd/client.clientId=$(CLIENT_ID)"  \
                 -o $@
 
-$(CLIENT_BINARY): $(shell find . -name '*.go')
+.PHONY: client
+client:
         @[ "$(CLIENT_ID)" ] || ( echo "CLIENT_ID must be set"; exit 1 )
 
         CGO_ENABLED=0 go build \
@@ -18,15 +22,24 @@ $(CLIENT_BINARY): $(shell find . -name '*.go')
                 -ldflags "-X main.appVersion=$(shell git describe --long --tags --dirty --always) \
                                   -X code.crute.us/mcrute/ssh-proxy/cmd/client.clientId=$(CLIENT_ID) \
                                   -s -w"  \
-                -o $@
+                -o $(OUTFILE)
+
+clients/$(CLIENT_BINARY)-x86_64: $(CLIENT_FILES)
+        GOARCH=amd64 OUTFILE=$@ $(MAKE) client
+
+clients/$(CLIENT_BINARY)-arm64: $(CLIENT_FILES)
+        GOARCH=arm64 OUTFILE=$@ $(MAKE) client
+
+.PHONY: release
+release: clients/$(CLIENT_BINARY)-x86_64 clients/$(CLIENT_BINARY)-arm64 $(SERVER_BINARY)
 
 .PHONY: vet
 vet: main.go
         go vet $<
 
 .PHONY: docker
-docker: $(BINARY)
-        mkdir docker; cp Dockerfile $(BINARY) docker; cd docker; \
+docker: $(SERVER_BINARY)
+        mkdir docker; cp Dockerfile $(SERVER_BINARY) docker; cd docker; \
         docker pull $(shell grep '^FROM ' Dockerfile | cut -d' ' -f2); \
         docker build --no-cache -t $(IMAGE):stage .
 
@@ -41,23 +54,15 @@ publish-prod:
 
 .PHONY: clean
 clean:
-        rm -rf docker || true
-        rm $(BINARY) || true
-
-.PHONY: run-backfill
-run-backfill: clean $(BINARY)
-        test -n "$(VAULT_ROLE_ID)" # Caller must export VAULT_ROLE_ID
-        test -n "$(VAULT_SECRET_ID)" # Caller must also export VAULT_SECRET_ID
-        VAULT_ADDR="https://vault.sea4.crute.me:8200" \
-                VAULT_SKIP_VERIFY=true \
-                ./web-server backfill-shakes
+        rm -rf docker clients || true
+        rm $(SERVER_BINARY) || true
 
 .PHONY: run-web
-run-web: clean $(BINARY)
+run-web: clean $(SERVER_BINARY)
         test -n "$(VAULT_ROLE_ID)" # Caller must export VAULT_ROLE_ID
         test -n "$(VAULT_SECRET_ID)" # Caller must also export VAULT_SECRET_ID
         VAULT_ADDR="https://vault.sea4.crute.me:8200" \
                 VAULT_SKIP_VERIFY=true \
-                ./$(BINARY)  \
+                ./$(SERVER_BINARY)  \
                 --hostname=dev.ssh-proxy.crute.me \
                 web