Module: check_mk
Branch: master
Commit: 63ea39d9c3de3bfa946e786a3564648dc64e182e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63ea39d9c3de3b…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Apr 26 10:56:30 2019 +0200
Use compiledb's default compile_command.json format.
We need to use a very recent cppcheck because of other bugs, anyway.
Change-Id: Ib19d532942ac034e43e07e9b8aaaa2f67bcf5d1d
---
livestatus/src/Makefile.am | 4 +---
livestatus/src/test/Makefile.am | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index a387340..bdd3256 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -176,11 +176,9 @@ livestatus.o: $(liblivestatus_a_OBJECTS)
$(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup
$(RM) NagiosMockup
-# NOTE: cppcheck up to 7287ffe (2019-04-15) understands only the old "command
-# style", so we have to stick with that for now. :-/
compile_commands.json: Makefile $(wildcard *.cc *.h)
$(MAKE) -C $(top_srcdir) .venv
- $(MAKE) -Bnwk | pipenv run compiledb --command-style
+ $(MAKE) -Bnwk | pipenv run compiledb
tidy: compile_commands.json
$(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK)
diff --git a/livestatus/src/test/Makefile.am b/livestatus/src/test/Makefile.am
index fcc0be9..e8a4ab5 100644
--- a/livestatus/src/test/Makefile.am
+++ b/livestatus/src/test/Makefile.am
@@ -76,12 +76,10 @@ $(test_neb_SOURCES): build_googletest
build_googletest:
bash -c "make -C $(GOOGLETEST) build" > /dev/null
-# NOTE: cppcheck up to 7287ffe (2019-04-15) understands only the old "command
-# style", so we have to stick with that for now. :-/
compile_commands.json: Makefile $(wildcard *.cc *.h)
$(MAKE) -C $(top_srcdir) .venv
$(MAKE) -j4 -C ..
- $(MAKE) -Bnwk | PIPENV_MAX_DEPTH=4 pipenv run compiledb --command-style
+ $(MAKE) -Bnwk | PIPENV_MAX_DEPTH=4 pipenv run compiledb
tidy: compile_commands.json
$(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK)