tools: config-create: Do not enter infinite over disabled PCI devices

[jailhouse.git] / Makefile

diff --git a/Makefile b/Makefile
index bac97e9dbcd1d76fb9fdec047b01d74d1e7bb005..6d597af281d4a74c91e59cb38aa9ebe63464f382 100644 (file)
--- 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
@@ -39,19 +43,29 @@ tools:
 docs:
        $(DOXYGEN) Documentation/Doxyfile
 
+# remove generated docs
+docs_clean:
+       rm -rf Documentation/generated
+
 # clean up kernel, tools and generated docs
-clean:
+clean: docs_clean
        $(Q)$(MAKE) $(kbuild)
        $(Q)$(MAKE) -C tools $@
-       rm -rf Documentation/generated
 
 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
+.PHONY: modules_install install clean firmware_install modules tools docs \
+       docs_clean