Module: check_mk Branch: master Commit: d504dfec743b87aabb7562a6ce56e55ededef177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d504dfec743b87… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Nov 21 13:39:47 2018 +0100 CMK-1134: Build managed and enterprise the same way as all the other packages. Change-Id: Ia534200bd971959c448bd395fe14f8a86500ca5d --- omd/Makefile | 15 +++++++-------- omd/packages/packages.make | 4 +++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 35be6b5..09cd3b3 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -54,6 +54,13 @@ PACKAGES := \ snap7 \ heirloom-pkgtools +ifeq ($(EDITION),enterprise) +PACKAGES += enterprise +endif +ifeq ($(EDITION),managed) +PACKAGES += enterprise +PACKAGES += managed +endif default: build @@ -83,14 +90,6 @@ check-edition: fi build: check-edition $(PACKAGES) -# TODO: Clean up build for enterprise and managed. Those 2 package Makefiles are Symlinked to the top level Makefile. -ifeq ($(EDITION),enterprise) - $(MAKE) -C $(PACKAGE_DIR)/check_mk_enterprise build -endif -ifeq ($(EDITION),managed) - $(MAKE) -C $(PACKAGE_DIR)/check_mk_enterprise - $(MAKE) -C $(PACKAGE_DIR)/check_mk_managed -endif pack: skel diff --git a/omd/packages/packages.make b/omd/packages/packages.make index f1143fe..78d8444 100644 --- a/omd/packages/packages.make +++ b/omd/packages/packages.make @@ -102,4 +102,6 @@ include packages/apache-omd/apache-omd.make \ packages/re2/re2.make \ packages/rrdtool/rrdtool.make \ packages/snap7/snap7.make \ - packages/Webinject/Webinject.make + packages/Webinject/Webinject.make \ + $(REPO_PATH)/enterprise/enterprise.make \ + $(REPO_PATH)/managed/managed.make