]> xenbits.xensource.com Git - xentesttools/bootstrap.git/commitdiff
Add NO_XEN=1 so that we can build an image without Xen in it.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 8 May 2013 14:15:57 +0000 (10:15 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 8 May 2013 14:15:57 +0000 (10:15 -0400)
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Makefile

index ba30dd376ff3630135c48efe6e3e5b4d515a930b..1979e761177478961b48988aecec9193572d79f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -179,9 +179,13 @@ xen-tools:
 
        $(MAKE) -C xen IOEMU_CONFIGURE_CROSS="--disable-curses --disable-slirp --disable-opengl --disable-sdl --disable-kvm --disable-vnc-tls" tools -j$$(($(NCPUS) * 2))
 
+ifeq ($(NOXEN),1)
+.PHONY: xen-dist
+xen_dist:
+else
 .PHONY: xen-dist
 xen-dist: xen-dist-nodep xen-tools
-
+endif
 .PHONY: xen-clean
 xen-clean:
        if [ -e xen ]; then \
@@ -205,7 +209,7 @@ DOM0_DEP_LIST = linux-modules
 
 .PHONY: root_image-dist-nodep
 root_image-dist-nodep:  $(LINUX_SRC)/usr/gen_init_cpio
-       $(MAKE) -C root_image
+       $(MAKE)  -C root_image
        $(INSTALL_DIR) dist/common/
        $(INSTALL_DATA) root_image/dist/common/initramfs.cpio.gz dist/common/