From 24da3687d9ce57b563beaed1f4fa09e46a802f5e Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 22 Apr 2025 16:57:17 +0200 Subject: [PATCH 1/3] Makefile: remove unneeded recursion.mk The MAKE_DEPTH variable is not used anywhere anymore. --- .make/recursion.mk | 8 -------- Makefile | 2 -- opencloud/Makefile | 1 - pkg/Makefile | 1 - protogen/Makefile | 1 - services/activitylog/Makefile | 1 - services/antivirus/Makefile | 1 - services/app-provider/Makefile | 1 - services/app-registry/Makefile | 1 - services/audit/Makefile | 1 - services/auth-app/Makefile | 1 - services/auth-basic/Makefile | 1 - services/auth-bearer/Makefile | 1 - services/auth-machine/Makefile | 1 - services/auth-service/Makefile | 1 - services/clientlog/Makefile | 1 - services/collaboration/Makefile | 1 - services/eventhistory/Makefile | 1 - services/frontend/Makefile | 1 - services/gateway/Makefile | 1 - services/graph/Makefile | 1 - services/groups/Makefile | 1 - services/idm/Makefile | 1 - services/idp/Makefile | 1 - services/invitations/Makefile | 1 - services/nats/Makefile | 1 - services/notifications/Makefile | 1 - services/ocdav/Makefile | 1 - services/ocm/Makefile | 1 - services/ocs/Makefile | 1 - services/policies/Makefile | 1 - services/postprocessing/Makefile | 1 - services/proxy/Makefile | 1 - services/search/Makefile | 1 - services/settings/Makefile | 1 - services/sharing/Makefile | 1 - services/sse/Makefile | 1 - services/storage-publiclink/Makefile | 1 - services/storage-shares/Makefile | 1 - services/storage-system/Makefile | 1 - services/storage-users/Makefile | 1 - services/thumbnails/Makefile | 1 - services/userlog/Makefile | 1 - services/users/Makefile | 1 - services/web/Makefile | 1 - services/webdav/Makefile | 1 - services/webfinger/Makefile | 1 - 47 files changed, 55 deletions(-) delete mode 100644 .make/recursion.mk diff --git a/.make/recursion.mk b/.make/recursion.mk deleted file mode 100644 index fcef863eb..000000000 --- a/.make/recursion.mk +++ /dev/null @@ -1,8 +0,0 @@ - -ifeq ($(MAKE_DEPTH),) -MAKE_DEPTH := 0 -else -$(eval MAKE_DEPTH := $(shell echo "$$(( $(MAKE_DEPTH) + 1 ))" ) ) -endif - -export diff --git a/Makefile b/Makefile index 7d88f8a70..ca1039842 100644 --- a/Makefile +++ b/Makefile @@ -78,8 +78,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn include .bingo/Variables.mk endif -include .make/recursion.mk - .PHONY: help help: @echo "Please use 'make ' where is one of the following:" diff --git a/opencloud/Makefile b/opencloud/Makefile index 059e39a37..4e147953b 100644 --- a/opencloud/Makefile +++ b/opencloud/Makefile @@ -11,7 +11,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn include ../.bingo/Variables.mk endif include ../.make/default.mk -include ../.make/recursion.mk include ../.make/go.mk include ../.make/release.mk include ../.make/docs.mk diff --git a/pkg/Makefile b/pkg/Makefile index f0363a3d0..698fd1bf7 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -5,7 +5,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn include ../.bingo/Variables.mk endif include ../.make/default.mk -include ../.make/recursion.mk include ../.make/go.mk include ../.make/release.mk include ../.make/docs.mk diff --git a/protogen/Makefile b/protogen/Makefile index 93930cc24..7a1f6677c 100644 --- a/protogen/Makefile +++ b/protogen/Makefile @@ -5,7 +5,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn include ../.bingo/Variables.mk endif include ../.make/default.mk -include ../.make/recursion.mk include ../.make/generate.mk .PHONY: go-generate diff --git a/services/activitylog/Makefile b/services/activitylog/Makefile index 0d6a6af77..c7180453a 100644 --- a/services/activitylog/Makefile +++ b/services/activitylog/Makefile @@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/antivirus/Makefile b/services/antivirus/Makefile index 47a588dd8..addc8a002 100644 --- a/services/antivirus/Makefile +++ b/services/antivirus/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/app-provider/Makefile b/services/app-provider/Makefile index f200baa5f..ba34ce2c7 100644 --- a/services/app-provider/Makefile +++ b/services/app-provider/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/app-registry/Makefile b/services/app-registry/Makefile index c35e1fa1b..6f959ec78 100644 --- a/services/app-registry/Makefile +++ b/services/app-registry/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/audit/Makefile b/services/audit/Makefile index d7abe3749..ecd683a3c 100644 --- a/services/audit/Makefile +++ b/services/audit/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/auth-app/Makefile b/services/auth-app/Makefile index 4d2f8f1d7..f2a24dbd0 100644 --- a/services/auth-app/Makefile +++ b/services/auth-app/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/auth-basic/Makefile b/services/auth-basic/Makefile index 8d7cab3a8..68dbf6ba3 100644 --- a/services/auth-basic/Makefile +++ b/services/auth-basic/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/auth-bearer/Makefile b/services/auth-bearer/Makefile index 30bd5d69f..8d89b6eee 100644 --- a/services/auth-bearer/Makefile +++ b/services/auth-bearer/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/auth-machine/Makefile b/services/auth-machine/Makefile index ef21e4be4..b880dea62 100644 --- a/services/auth-machine/Makefile +++ b/services/auth-machine/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/auth-service/Makefile b/services/auth-service/Makefile index e0bebf523..3e4226894 100644 --- a/services/auth-service/Makefile +++ b/services/auth-service/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/clientlog/Makefile b/services/clientlog/Makefile index fa6927bab..fafc6d26c 100644 --- a/services/clientlog/Makefile +++ b/services/clientlog/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/collaboration/Makefile b/services/collaboration/Makefile index c8273d6d0..1c62bcf7d 100644 --- a/services/collaboration/Makefile +++ b/services/collaboration/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/eventhistory/Makefile b/services/eventhistory/Makefile index 62ed0bf39..393882eca 100644 --- a/services/eventhistory/Makefile +++ b/services/eventhistory/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/frontend/Makefile b/services/frontend/Makefile index 1bdbc6834..eda820ce4 100644 --- a/services/frontend/Makefile +++ b/services/frontend/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/gateway/Makefile b/services/gateway/Makefile index 8f7ba6f9d..7b193fb05 100644 --- a/services/gateway/Makefile +++ b/services/gateway/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/graph/Makefile b/services/graph/Makefile index aa80ead13..ee9d95e9c 100644 --- a/services/graph/Makefile +++ b/services/graph/Makefile @@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/groups/Makefile b/services/groups/Makefile index 99f974c78..fb80fa5fc 100644 --- a/services/groups/Makefile +++ b/services/groups/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/idm/Makefile b/services/idm/Makefile index d8ba474d7..2c53ad5ae 100644 --- a/services/idm/Makefile +++ b/services/idm/Makefile @@ -7,7 +7,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/idp/Makefile b/services/idp/Makefile index 499de8148..3f13072b9 100644 --- a/services/idp/Makefile +++ b/services/idp/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/invitations/Makefile b/services/invitations/Makefile index 5660dcb59..beaeb351f 100644 --- a/services/invitations/Makefile +++ b/services/invitations/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/nats/Makefile b/services/nats/Makefile index a6ba55d98..0e06713d5 100644 --- a/services/nats/Makefile +++ b/services/nats/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 28944cbd5..90e67dd78 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/ocdav/Makefile b/services/ocdav/Makefile index 89c152a20..392e8f6cf 100644 --- a/services/ocdav/Makefile +++ b/services/ocdav/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/ocm/Makefile b/services/ocm/Makefile index 4dc5cb82f..4774695f2 100644 --- a/services/ocm/Makefile +++ b/services/ocm/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/ocs/Makefile b/services/ocs/Makefile index e03181e31..17d92f4f1 100644 --- a/services/ocs/Makefile +++ b/services/ocs/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/policies/Makefile b/services/policies/Makefile index 81c60e0cc..e7eb76274 100644 --- a/services/policies/Makefile +++ b/services/policies/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/postprocessing/Makefile b/services/postprocessing/Makefile index 255e6d323..7b306856c 100644 --- a/services/postprocessing/Makefile +++ b/services/postprocessing/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/proxy/Makefile b/services/proxy/Makefile index 39a3bf50a..13ad7a829 100644 --- a/services/proxy/Makefile +++ b/services/proxy/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/search/Makefile b/services/search/Makefile index cd1195517..fa38d0276 100644 --- a/services/search/Makefile +++ b/services/search/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/settings/Makefile b/services/settings/Makefile index b8167cc52..d3c44051d 100644 --- a/services/settings/Makefile +++ b/services/settings/Makefile @@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/sharing/Makefile b/services/sharing/Makefile index c9477dd79..d0c0d7b59 100644 --- a/services/sharing/Makefile +++ b/services/sharing/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/sse/Makefile b/services/sse/Makefile index 6c2f9b052..5fcc294ac 100644 --- a/services/sse/Makefile +++ b/services/sse/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/storage-publiclink/Makefile b/services/storage-publiclink/Makefile index abe0f4194..32feca80c 100644 --- a/services/storage-publiclink/Makefile +++ b/services/storage-publiclink/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/storage-shares/Makefile b/services/storage-shares/Makefile index 9589cfc11..c29ebbe51 100644 --- a/services/storage-shares/Makefile +++ b/services/storage-shares/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/storage-system/Makefile b/services/storage-system/Makefile index 4b93f7bf2..82d8a6129 100644 --- a/services/storage-system/Makefile +++ b/services/storage-system/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/storage-users/Makefile b/services/storage-users/Makefile index 03ddb2048..dd2e18cef 100644 --- a/services/storage-users/Makefile +++ b/services/storage-users/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/thumbnails/Makefile b/services/thumbnails/Makefile index 14f556180..ed66a5936 100644 --- a/services/thumbnails/Makefile +++ b/services/thumbnails/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/userlog/Makefile b/services/userlog/Makefile index 002711c05..11de808d4 100644 --- a/services/userlog/Makefile +++ b/services/userlog/Makefile @@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/users/Makefile b/services/users/Makefile index 8c2e22d92..ab98b072e 100644 --- a/services/users/Makefile +++ b/services/users/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/web/Makefile b/services/web/Makefile index a505570c0..b0454f2df 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/webdav/Makefile b/services/webdav/Makefile index 536a3cd72..418c8e2ea 100644 --- a/services/webdav/Makefile +++ b/services/webdav/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk diff --git a/services/webfinger/Makefile b/services/webfinger/Makefile index 070f11d6b..aa5e220c2 100644 --- a/services/webfinger/Makefile +++ b/services/webfinger/Makefile @@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk endif include ../../.make/default.mk -include ../../.make/recursion.mk include ../../.make/go.mk include ../../.make/release.mk include ../../.make/docs.mk From f3230164cd93e147aa50e850aa35880e147b51a2 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 22 Apr 2025 17:07:01 +0200 Subject: [PATCH 2/3] Makefile: graph depends on mockery --- services/graph/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/graph/Makefile b/services/graph/Makefile index ee9d95e9c..ddd0dc830 100644 --- a/services/graph/Makefile +++ b/services/graph/Makefile @@ -13,7 +13,7 @@ include ../../.make/release.mk include ../../.make/docs.mk .PHONY: go-generate -go-generate: +go-generate: $(MOCKERY) $(MOCKERY) .PHONY: l10n-pull From d0837780b17f8add0cef107acd09b7b4e3238871 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 22 Apr 2025 17:07:55 +0200 Subject: [PATCH 3/3] Makefile: fix idp dependencies The pnp-build step create the static assets tree. So make the other steps depend on it. --- services/idp/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/services/idp/Makefile b/services/idp/Makefile index 3f13072b9..00f3505a6 100644 --- a/services/idp/Makefile +++ b/services/idp/Makefile @@ -15,20 +15,16 @@ node-generate-prod: assets .PHONY: assets assets: pnpm-build \ - assets/identifier/static \ assets/identifier/static/favicon.svg \ assets/identifier/static/icon-lilac.svg -assets/identifier/static: - mkdir -p assets/identifier/static - .PHONY: assets/identifier/static/favicon.svg # force overwrite -assets/identifier/static/favicon.svg: +assets/identifier/static/favicon.svg: pnpm-build cp src/images/favicon.svg assets/identifier/static/favicon.svg rm assets/identifier/static/favicon.ico .PHONY: assets/identifier/static/icon-lilac.svg -assets/identifier/static/icon-lilac.svg: +assets/identifier/static/icon-lilac.svg: pnpm-build cp src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg .PHONY: pnpm-build