From a1c9609d1459c295f7198a064de4bf2a40038d70 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fischer@muhq.space>
Date: Fri, 27 Aug 2021 16:35:55 +0200
Subject: [PATCH] [Make] use tidy make target instead of the meson generated
 clang-tidy target

The meson generated clang-tidy target uses compile_commands including
all code from subprojects and therefore fails due to code not in our control.
The gitlab CI also uses the tidy make target.
---
 Makefile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 14cd8430..357b3ecb 100644
--- a/Makefile
+++ b/Makefile
@@ -34,21 +34,11 @@ debug:
 	rm -f build
 	$(MAKE) build BUILDTYPE=$@
 
-# Meson >= 0.52 will automatically generate a clang-tidy target if a
-# .clang-tidy file is found.
-# Source version check: https://stackoverflow.com/a/3732456/194894
-ifeq ($(shell [ $(MESON_MINOR_VERSION) -ge 52 ] && echo true), true)
-STATIC_ANALYSIS_NINJA_TARGETS += clang-tidy
-else
-$(warning old mesion version $(MESON_VERSION) detected, meson >= 0.52 required for clang-tidy)
-endif
-
 .PHONY: fast-static-analysis
 fast-static-analysis: all check-format check-license doc
 
 .PHONY: static-analysis
-static-analysis: fast-static-analysis iwyu
-	$(NINJA) -C build $(STATIC_ANALYSIS_NINJA_TARGETS)
+static-analysis: fast-static-analysis iwyu tidy
 
 .PHONY: smoke-test-suite
 smoke-test-suite: all
-- 
GitLab