Module: check_mk
Branch: master
Commit: c8d948f5712ebe7f9a5832a90e0788d5ed81603f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8d948f5712ebeā¦
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri Feb 3 14:24:00 2017 +0100
Simplification.
Change-Id: I57ce788ba6a9883bb147998d35866a6a72114f62
---
Makefile | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
index 89a02ae..be74945 100644
--- a/Makefile
+++ b/Makefile
@@ -22,12 +22,6 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-ifneq (,$(wildcard enterprise))
-ENTERPRISE := yes
-else
-ENTERPRISE := no
-endif
-
SHELL := /bin/bash
VERSION := 1.4.0i4
NAME := check_mk
@@ -226,11 +220,9 @@ setversion:
sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/'
scripts/setup.sh ; \
echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files
$(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion
-ifeq ($(ENTERPRISE),yes)
- sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/'
enterprise/bin/liveproxyd
- sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/'
enterprise/bin/cmcdump
- sed -i 's/^__version__ = ".*/__version__ = "$(NEW_VERSION)"/'
enterprise/agents/plugins/cmk-update-agent
-endif
+ test -d enterprise && sed -i
's/^VERSION=".*/VERSION="$(NEW_VERSION)"/'
enterprise/bin/liveproxyd
+ test -d enterprise && sed -i
's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' enterprise/bin/cmcdump
+ test -d enterprise && sed -i 's/^__version__ = ".*/__version__ =
"$(NEW_VERSION)"/' enterprise/agents/plugins/cmk-update-agent
headers:
doc/helpers/headrify
@@ -352,10 +344,8 @@ GTAGS: config.h
compile_commands.json: config.h $(FILES_TO_FORMAT)
$(MAKE) -C livestatus clean
$(BEAR) $(MAKE) -C livestatus -j8
-ifeq ($(ENTERPRISE),yes)
- $(MAKE) -C enterprise/core clean
- $(BEAR) --append $(MAKE) -C enterprise/core -j8
-endif
+ test -d enterprise && $(MAKE) -C enterprise/core clean
+ test -d enterprise && $(BEAR) --append $(MAKE) -C enterprise/core -j8
tidy: compile_commands.json
@scripts/compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__