From fe618ac2468cbc7818117410476f93698c60269b Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Mon, 29 Jul 2019 18:49:21 +0200
Subject: [PATCH] :construction_worker: adjust maintainer scripts

---
 .clang-tidy | 3 +++
 Makefile    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 0a04d2864..feee81945 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -4,14 +4,17 @@ Checks: '-*,
          clang-analyzer-*,
          google-*,
          -google-runtime-references,
+         -google-explicit-constructor,
          hicpp-*,
          -hicpp-no-array-decay,
          -hicpp-uppercase-literal-suffix,
+         -hicpp-explicit-conversions,
          misc-*,
          -misc-non-private-member-variables-in-classes,
          llvm-*,
          -llvm-header-guard,
          modernize-*,
+         -modernize-use-trailing-return-type,
          performance-*,
          portability-*,
          readability-*,
diff --git a/Makefile b/Makefile
index abc973896..4fb303fcb 100644
--- a/Makefile
+++ b/Makefile
@@ -435,7 +435,7 @@ fuzzing-stop:
 # call cppcheck <http://cppcheck.sourceforge.net>
 # Note: this target is called by Travis
 cppcheck:
-	cppcheck --enable=warning --inline-suppr --inconclusive --force --std=c++11 $(SRCS) --error-exitcode=1
+	cppcheck --enable=warning --inline-suppr --inconclusive --force --std=c++11 $(AMALGAMATED_FILE) --error-exitcode=1
 
 # call Clang Static Analyzer <https://clang-analyzer.llvm.org>
 clang_analyze:
@@ -457,7 +457,7 @@ cpplint:
 
 # call Clang-Tidy <https://clang.llvm.org/extra/clang-tidy/>
 clang_tidy:
-	$(COMPILER_DIR)/clang-tidy $(SRCS) -- -Iinclude -std=c++11
+	$(COMPILER_DIR)/clang-tidy $(AMALGAMATED_FILE) -- -Iinclude -std=c++11
 
 # call PVS-Studio Analyzer <https://www.viva64.com/en/pvs-studio/>
 pvs_studio: