From f0aea6646f52a561134a12d3b45aea5a637f8560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Thu, 24 Feb 2022 11:35:54 +0100
Subject: [PATCH] Run `go generate` in the right order

The `pkg/api` code needs to be generated before the interface mocks that
use it.
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 49760c68..ae337482 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,8 @@ socketio-poc:
 	go build -v ${BUILD_FLAGS} ${PKG}/cmd/socketio-poc
 
 generate:
-	go generate ${PKG}/...
+	go generate ./pkg/...
+	go generate ./internal/...
 
 # resource.syso: resource/thermogui.ico resource/versioninfo.json
 # 	goversioninfo -icon=resource/thermogui.ico -64 resource/versioninfo.json
@@ -51,6 +52,8 @@ version:
 	@echo "Package: ${PKG}"
 	@echo "Version: ${VERSION}"
 	@echo "Target : ${OUT}"
+	@echo
+	@env | grep GO
 
 list-embedded:
 	@go list -f '{{printf "%10s" .Name}}: {{.EmbedFiles}}' ${PKG}/...
@@ -77,7 +80,7 @@ lint:
 clean:
 	@go clean -i -x
 	rm -f flamenco*-poc-v* flamenco*-poc *.exe resource.syso pkg/api/*.gen.go
-	go generate ./...
+	@$(MAKE) generate
 
 # static: vet lint resource.syso
 static: vet lint generate