Merge pull request #709 from rhafer/makefile

Some smaller Makefile adjustments
2025-12-21 12:09:40 -06:00 · 2025-04-23 08:40:08 +02:00
parent 8c7f723fd2 d0837780b1
commit 1becc86cfe
47 changed files with 3 additions and 62 deletions
--- a/.make/recursion.mk
+++ b/.make/recursion.mk
@@ -1,8 +0,0 @@
-
-ifeq ($(MAKE_DEPTH),)
-MAKE_DEPTH := 0
-else
-$(eval MAKE_DEPTH := $(shell echo "$$(( $(MAKE_DEPTH) + 1 ))" ) )
-endif
-
-export
--- a/2
+++ b/2
@@ -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 <target>' where <target> is one of the following:"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/services/graph/Makefile
+++ b/services/graph/Makefile
@@ -8,13 +8,12 @@ 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

 .PHONY: go-generate
-go-generate:
+go-generate: $(MOCKERY)
 	$(MOCKERY)

 .PHONY: l10n-pull
--- 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
--- 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
--- 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
@@ -16,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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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