[checkmk-commits] fix openhardwaremonitor

Module: check_mk Branch: master Commit: 9b0cf6d81e181f0c16c2fe686ca17348937f6406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0cf6d81e181f… Author: Alex Zurhake &lt;az(a)mathias-kettner.de&gt; Date: Mon Nov 19 10:48:04 2018 +0100 fix openhardwaremonitor Change-Id: Ia6148942ca9089da2ae26b00f3497b94d9580e64 --- Makefile | 5 +++++ omd/packages/openhardwaremonitor/openhardwaremonitor.make | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 154b09c..3d4d18b 100644 --- a/Makefile +++ b/Makefile @@ -257,6 +257,11 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo " FINISHED. " @echo "==============================================================================" +omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe: + $(MAKE) -C omd openhardwaremonitor-dist + +omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll: omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe + .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 efefbf5..9242cbc 100644 --- a/omd/packages/openhardwaremonitor/openhardwaremonitor.make +++ b/omd/packages/openhardwaremonitor/openhardwaremonitor.make @@ -24,7 +24,7 @@ $(OPENHARDWAREMONITOR)-dist: $(OPENHARDWAREMONITOR_DIST) # . #$(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(OPENHARDWAREMONITOR_DIR)/Bin/Release/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 +$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe: $(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 @@ -36,6 +36,8 @@ $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/ cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) +$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe + $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI cp -r $< $(OPENHARDWAREMONITOR_DIR)/ @@ -55,7 +57,7 @@ $(OPENHARDWAREMONITOR)-setup: mono-complete \ mono-xbuild -$(OPENHARDWAREMONITOR_DIST): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll +$(OPENHARDWAREMONITOR_DIST): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(TOUCH) $@ $(OPENHARDWAREMONITOR)-clean-ohm: clean