From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 21 Jun 2012 16:38:59 +0000 (-0400)
Subject: Makefile: Build out of tree QEMU.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fcf2ae202a8ffb604c587b587bbc5327c3fab838;p=xentesttools%2Fbootstrap.git

Makefile: Build out of tree QEMU.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/Makefile b/Makefile
index 7e03bf2..7c20bad 100644
--- a/Makefile
+++ b/Makefile
@@ -184,15 +184,7 @@ xen-distclean: xen-clean
 		$(MAKE) -C xen distclean; \
 	fi \
 
-.PHONY: qemu
-qemu:
-	if [ -e qemu/configure ]; then \
-		if ! [ -e qemu/config.h ]; \
-			then (cd qemu;./configure --enable-vhost-net --enable-kvm --enable-virtfs --disable-curses --disable-slirp --disable-opengl --disable-sdl --disable-vnc-tls --prefix=/usr); \
-		fi; \
-	fi
-	$(MAKE) -C qemu
-	
+
 #####################################################################
 #			      root_image rules
 #####################################################################
diff --git a/root_image/Makefile b/root_image/Makefile
index d837fe3..bb6b0b8 100644
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -188,7 +188,7 @@ distdir:
 # This target includes all userspace tools and images
 # It does not include the Linux drivers/modules found in the modulespace target
 .PHONY:	root_image-userspace-install
-root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install kexec-tools-install perf-install oprofile-install
+root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install  perf-install oprofile-install
 
 	rm -rf userspace/man
 	rm -rf userspace/usr/share/man
@@ -944,6 +944,21 @@ fio-install: fio/fio
 	$(INSTALL_PROG)   fio/fio     userspace/usr/bin/
 	cp fio/examples/*	userspace/root
 
+.PHONY: qemu-install
+qemu-install:
+	if [ -e qemu/configure ]; then \
+		if ! [ -e qemu/config.h ]; then \
+				(cd qemu;./configure --enable-vhost-net --enable-kvm --disable-xen \
+				 --disable-curses --disable-slirp --disable-opengl --disable-sdl \
+				--disable-vnc-sasl  --disable-vnc-tls --prefix=/usr/kvm \
+				--target-list=$(ARCH)-softmmu); \
+				echo "#include \"config-host.h\"" > qemu/config.h; \
+				echo "#include \"config-target.h\"" >> qemu/config.h; \
+		fi; \
+	fi
+	$(MAKE) -C qemu -j$$(($(NCPUS) * 2)) V=1
+	$(MAKE) -C qemu DESTDIR=$(shell pwd)/userspace/ install
+
 .PHONY:	root_image-tools-install
 root_image-tools-install: userspace-prep