[Xen-devel] [PATCH RFC v1 10/14] Makefile: require QEMU_ROOT to be defined

[Wei Liu <wei.liu2@xxxxxxxxxx>]

Don't tread into xen.git and clone one there.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 Makefile | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 19b80a0..ff15d16 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,10 @@ ifeq (,$(MINIOS_ROOT))
   $(error Please define MINIOS_ROOT environment variable)
 endif
 
+ifeq (,$(QEMU_ROOT))
+  $(error Please define QEMU_ROOT environment variable)
+endif
+
 export MINI_OS=$(MINIOS_ROOT)
 export STUBDOM_ROOT=$(CURDIR)
 export XEN_ROOT
@@ -272,36 +276,15 @@ $(OCAML_STAMPFILE): ocaml-$(XEN_TARGET_ARCH)/.dirstamp
 .PHONY: $(CROSS_ROOT)
 $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci
 
-QEMU_ROOT := $(shell if [ -d "$(QEMU_TRADITIONAL_LOC)" ]; then echo 
"$(QEMU_TRADITIONAL_LOC)"; else echo .; fi)
+export QEMU_ROOT
 
 ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),)
 IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp
 endif
 
-ifeq ($(QEMU_ROOT),.)
-$(XEN_ROOT)/tools/qemu-xen-traditional-dir:
-       $(MAKE) DESTDIR= -C $(XEN_ROOT)/tools qemu-xen-traditional-dir-find
-
-ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/qemu-xen-traditional-dir
-       mkdir -p ioemu
-       set -e;                                                                 
\
-       $(buildmakevars2shellvars);                                             
\
-       cd ioemu;                                                               
\
-       src="$$XEN_ROOT/tools/qemu-xen-traditional-dir"; export src;            
\
-       (cd $$src && find * -type d -print) | xargs mkdir -p;                   
\
-       (cd $$src && find *     ! -type l  -type f  $(addprefix ! -name ,       
\
-                       '*.[oda1]' 'config-*' config.mak qemu-dm qemu-img-xen   
\
-                       '*.html' '*.pod'                                        
\
-                       )) |                                                    
\
-           while read f; do rm -f "$$f"; ln -s "$$src/$$f" "$$f"; done
-       touch ioemu/linkfarm.stamp
-else
-export QEMU_ROOT
-
 ioemu/linkfarm.stamp:
        mkdir -p ioemu
        touch ioemu/linkfarm.stamp
-endif
 
 mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET)
        $(MAKE) -C $(XEN_ROOT)/tools/include
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel