From c8c1c21aafd9291c1ffa88fb8ce6cf9db62ddd50 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Thu, 14 Apr 2022 21:42:22 +1000 Subject: [PATCH] Makefile: complete update targets before build targets if both are specified --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index c1d7a6dd..00f80df4 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SERVER = xonotic-local-dedicated # use CFLAGS to set default optimisations and support user override CFLAGS ?= -pipe -march=native -mtune=native -flto=auto # user can override this with make -j -MAKEFLAGS = -j$(shell nproc) +MAKEFLAGS := -j$(shell nproc) # DP makefile overrides CFLAGS (exporting CFLAGS does work for d0_blind_id but so does this) export CC += $(CFLAGS) @@ -51,15 +51,15 @@ help: @echo " make both" @echo -.PHONY: nogit -nogit: - @if [ -d .git ]; then \ - echo "To compile from git sources, please use ./all instead!"; \ - exit 1; \ - fi +GIT := $(shell [ -d .git ] && echo "To compile from git, please read https://gitlab.com/xonotic/xonotic/-/wikis/Repository_Access ") +ifdef GIT + $(error $(GIT)) +endif + +.EXTRA_PREREQS := $(findstring update-stable,$(MAKECMDGOALS)) $(findstring update-beta,$(MAKECMDGOALS)) .PHONY: clean-sources -clean-sources: nogit +clean-sources: $(MAKE) -C $(DPSRC) clean $(MAKE) -C $(D0SRC) clean @@ -68,18 +68,18 @@ clean: clean-sources $(RM) $(CLIENT) $(SERVER) .PHONY: update-stable -update-stable: nogit +update-stable: misc/tools/rsync-updater/update-to-release.sh .PHONY: update-beta -update-beta: nogit +update-beta: misc/tools/rsync-updater/update-to-autobuild.sh $(D0SRC)/Makefile: ( cd $(D0SRC) && ./autogen.sh && ./configure --enable-static --disable-shared ) .PHONY: d0_blind_id -d0_blind_id: nogit $(D0SRC)/Makefile +d0_blind_id: $(D0SRC)/Makefile $(MAKE) -C $(D0SRC) .PHONY: server -- 2.39.2