From f2dda804a67bf8ba4a8c87f18f6a54987a39cfb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 19 Aug 2021 14:30:01 +0200 Subject: [PATCH] syntax-check: assume we're using git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meson already checks whether we're using git before running syntax check. This only affects direct invocation through make. Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index cedb360bfd..e523c0bf3f 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -37,9 +37,6 @@ _sp = $(_empty) $(_empty) # If S1 == S2, return S1, otherwise the empty string. _equal = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1))) -GIT = git -VC = $(GIT) - VC_LIST = $(top_srcdir)/build-aux/vc-list-files -C $(top_srcdir) # You can override this variable in syntax-check.mk to set your own regexp @@ -85,15 +82,6 @@ syntax-check-rules := $(sort $(shell $(SED) -n \ 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(top_srcdir)/$(ME) $(_cfg_mk))) .PHONY: $(syntax-check-rules) -ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0) - local-checks-available += $(syntax-check-rules) -else - local-checks-available += no-vc-detected -no-vc-detected: - @echo "No version control files detected; skipping syntax check" -endif -.PHONY: $(local-checks-available) - # Arrange to print the name of each syntax-checking rule just before running it. $(syntax-check-rules): %: %.m sc_m_rules_ = $(patsubst %, %.m, $(syntax-check-rules)) @@ -116,7 +104,7 @@ $(sc_z_rules_): %.z: % # that computes and prints elapsed time. local-check := \ $(patsubst sc_%, sc_%.z, \ - $(filter-out $(local-checks-to-skip), $(local-checks-available))) + $(filter-out $(local-checks-to-skip), $(syntax-check-rules))) syntax-check: $(local-check)