From 023ff83d881fb810f4428594ca476bb436b303f6 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 21 Jul 2016 13:07:03 +0300
Subject: [build] Fix 'make tidy' on linux

---
 Makefile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 791afed3c5..bb208175c8 100644
--- a/Makefile
+++ b/Makefile
@@ -168,11 +168,11 @@ clang-tools: compdb
 
 .PHONY: tidy
 tidy: clang-tools
-	scripts/clang-tools.sh $(MACOS_OUTPUT_PATH)/$(BUILDTYPE)
+	scripts/clang-tools.sh $(MACOS_COMPDB_PATH)
 
 .PHONY: check
 check: clang-tools
-	scripts/clang-tools.sh $(MACOS_OUTPUT_PATH)/$(BUILDTYPE) --diff
+	scripts/clang-tools.sh $(MACOS_COMPDB_PATH) --diff
 
 endif
 
@@ -304,23 +304,18 @@ coverage: test
 compdb: $(LINUX_BUILD)
 	# Ninja generator already outputs the file at the right location
 
-.PHONY: tidy
-tidy: compdb
-	$(NINJA) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-headers
-	scripts/clang-tidy.sh $(LINUX_OUTPUT_PATH)
-
 .PHONY: clang-tools
-clang-tools:
+clang-tools: compdb
 	if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.8.0; fi
 	if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.8.0; fi
-	deps/ninja/ninja-linux -C $(LINUX_OUTPUT_PATH) headers
+	$(NINJA) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-headers
 
 .PHONY: tidy
 tidy: clang-tools
 	scripts/clang-tools.sh $(LINUX_OUTPUT_PATH)
 
 .PHONY: check
-check: compdb clang-tools
+check: clang-tools
 	scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) --diff
 
 endif
-- 
cgit v1.2.1