[checkmk-commits] Call make via compiledb itself.

Sven Panne sp at mathias-kettner.de
Mon May 6 16:10:32 CEST 2019


Module: check_mk
Branch: master
Commit: 3830c18551c7630cf99a193e7c35a17618202468
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3830c18551c7630cf99a193e7c35a17618202468

Author: Sven Panne <sp at mathias-kettner.de>
Date:   Mon May  6 15:51:59 2019 +0200

Call make via compiledb itself.

Change-Id: I4024034af68ba470ff0f9bdb8c347cd23e3fd7c5

---

 livestatus/src/Makefile.am      | 2 +-
 livestatus/src/test/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am
index 759e63e..6470419 100644
--- a/livestatus/src/Makefile.am
+++ b/livestatus/src/Makefile.am
@@ -178,7 +178,7 @@ livestatus.o: $(liblivestatus_a_OBJECTS)
 
 compile_commands.json: Makefile $(wildcard *.cc *.h)
 	$(MAKE) -C $(top_srcdir) .venv
-	LANG=C $(MAKE) -Bnwk | pipenv run compiledb
+	LANG=C pipenv run compiledb --no-build make
 
 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 1b13e39..c0886c9 100644
--- a/livestatus/src/test/Makefile.am
+++ b/livestatus/src/test/Makefile.am
@@ -79,7 +79,7 @@ build_googletest:
 compile_commands.json: Makefile $(wildcard *.cc  *.h)
 	$(MAKE) -C $(top_srcdir) .venv
 	$(MAKE) -j4 -C ..
-	LANG=C $(MAKE) -Bnwk | PIPENV_MAX_DEPTH=4 pipenv run compiledb
+	LANG=C PIPENV_MAX_DEPTH=4 pipenv run compiledb --no-build make
 
 tidy: compile_commands.json
 	$(RUN_CLANG_TIDY) -quiet -j6 $(FILES_TO_CHECK)



More information about the checkmk-commits mailing list