[checkmk-commits] fix recursive definitions of openhardwaremonitor targets

Module: check_mk Branch: master Commit: c16df4bef7b5e29ff14ca01f1c7b908db1d60ce2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c16df4bef7b5e2… Author: Alex Zurhake &lt;az(a)mathias-kettner.de&gt; Date: Mon Nov 19 09:18:58 2018 +0100 fix recursive definitions of openhardwaremonitor targets Change-Id: If9c6ffd333c69b37924da34b21699b78ae546961 --- Makefile | 3 --- omd/packages/openhardwaremonitor/openhardwaremonitor.make | 10 ++++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a852dd..154b09c 100644 --- a/Makefile +++ b/Makefile @@ -257,9 +257,6 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo " FINISHED. " @echo "==============================================================================" -omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll: - make -C omd openhardwaremonitor-dist - .werks/werks: $(WERKS) PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/werks cre diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor.make b/omd/packages/openhardwaremonitor/openhardwaremonitor.make index 8edc39b..efefbf5 100644 --- a/omd/packages/openhardwaremonitor/openhardwaremonitor.make +++ b/omd/packages/openhardwaremonitor/openhardwaremonitor.make @@ -4,6 +4,7 @@ OPENHARDWAREMONITOR_DIR := $(OPENHARDWAREMONITOR)-$(OPENHARDWAREMONITOR_VERS) OPENHARDWAREMONITOR_INSTALL := $(BUILD_HELPER_DIR)/$(OPENHARDWAREMONITOR_DIR)-install OPENHARDWAREMONITOR_UNPACK := $(BUILD_HELPER_DIR)/$(OPENHARDWAREMONITOR_DIR)-unpack +OPENHARDWAREMONITOR_DIST := $(BUILD_HELPER_DIR)/$(OPENHARDWAREMONITOR_DIR)-dist .PHONY: $(OPENHARDWAREMONITOR) $(OPENHARDWAREMONITOR)-setup $(OPENHARDWAREMONITOR)-clean-ohm $(OPENHARDWAREMONITOR)-dist $(OPENHARDWAREMONITOR)-build $(OPENHARDWAREMONITOR)-install $(OPENHARDWAREMONITOR)-skel $(OPENHARDWAREMONITOR)-clean @@ -15,13 +16,15 @@ $(OPENHARDWAREMONITOR): $(OPENHARDWAREMONITOR)-install: $(OPENHARDWAREMONITOR_INSTALL) +$(OPENHARDWAREMONITOR)-dist: $(OPENHARDWAREMONITOR_DIST) + # OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll # cp -p $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe \ # $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll \ # . #$(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln -OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln +$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln # The strange "cat" below is necessary because the extremely ancient Mono # versions coming with even the latest Ubuntus still contain the rather severe # bug https://github.com/mono/mono/issues/6752. ("...System.Exception: Magic @@ -30,6 +33,8 @@ OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UN /p:TargetFrameworkVersion="v4.5" \ $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln \ /target:OpenHardwareMonitorCLI | cat + cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) + cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI cp -r $< $(OPENHARDWAREMONITOR_DIR)/ @@ -50,7 +55,8 @@ $(OPENHARDWAREMONITOR)-setup: mono-complete \ mono-xbuild -$(OPENHARDWAREMONITOR)-dist: OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll +$(OPENHARDWAREMONITOR_DIST): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll + $(TOUCH) $@ $(OPENHARDWAREMONITOR)-clean-ohm: clean rm -f OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll