[checkmk-commits] Adapted a few paths.

Module: check_mk Branch: master Commit: ef1c4b887e79a8408b83548ccc14a72a29801e54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef1c4b887e79a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 15:18:21 2017 +0100 Adapted a few paths. Change-Id: I768145877e031555172aac1d06d627d501fa17b0 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 04ccaf2..7fc1070 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ version: setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ - sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ + sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkeventd bin/mkbackup ; \ sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ @@ -294,15 +294,15 @@ $(addprefix %/,$(LIVESTATUS_AUTO)): $(addprefix %/,configure.ac m4/* Makefile.am @echo "making $@: $? is newer" cd livestatus && autoreconf --install --include=m4 -livestatus/config.h: livestatus/configure livestatus/config.h.in +config.h: configure config.h.in @echo "making $@: $? is newer" - cd livestatus && ./configure CXXFLAGS="$(CXX_FLAGS)" + ./configure CXXFLAGS="$(CXX_FLAGS)" -GTAGS: livestatus/config.h +GTAGS: config.h $(MAKE) -C livestatus distclean-tags $(MAKE) -C livestatus GTAGS -compile_commands.json: livestatus/config.h $(FILES_TO_FORMAT) +compile_commands.json: config.h $(FILES_TO_FORMAT) @echo "making $@: $? is newer" $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8 @@ -315,7 +315,7 @@ iwyu: compile_commands.json @$(IWYU_TOOL) --output-format=clang -p . # Not really perfect rules, but better than nothing -analyze: livestatus/config.h +analyze: config.h $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" @@ -341,5 +341,5 @@ format: $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT) # Note: You need the doxygen and graphviz packages. -documentation: livestatus/config.h +documentation: config.h $(DOXYGEN) doc/Doxyfile