X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse.git/blobdiff_plain/822c7372ae245817d3f66076927632f41991b294..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index ec7deb2..6d597af 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,12 @@
 # the COPYING file in the top-level directory.
 #
 
+# Check make version
+need := 3.82
+ifneq ($(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
+$(error Too old make version $(MAKE_VERSION), at least $(need) required)
+endif
+
 # no recipes above this one (also no includes)
 all: modules tools
 
@@ -29,8 +35,6 @@ kbuild = -C $(KDIR) M=$$PWD $@
 modules:
 	$(Q)$(MAKE) $(kbuild)
 
-hypervisor/jailhouse.bin: modules
-
 # recursive build of tools
 tools:
 	$(Q)$(MAKE) -C tools
@@ -51,10 +55,16 @@ clean:	docs_clean
 modules_install: modules
 	$(Q)$(MAKE) $(kbuild)
 
-firmware_install: hypervisor/jailhouse.bin $(DESTDIR)$(firmwaredir)
-	$(INSTALL_DATA) $^
+firmware_install: $(DESTDIR)$(firmwaredir) modules
+	$(INSTALL_DATA) hypervisor/jailhouse*.bin $<
+
+ifeq ($(ARCH),x86)
+TOOL_INMATES_INSTALL := tool_inmates_install
+tool_inmates_install: $(DESTDIR)$(libexecdir)/jailhouse
+	$(INSTALL_DATA) inmates/tools/$(ARCH)/*.bin $<
+endif
 
-install: modules_install firmware_install
+install: modules_install firmware_install $(TOOL_INMATES_INSTALL)
 	$(Q)$(MAKE) -C tools $@
 
 .PHONY: modules_install install clean firmware_install modules tools docs \