[Qemu-devel] [PATCH] Add support for compiling outside the source tree (try #2)

["Anderson Lizardo" <anderson.lizardo@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

It seems my first patch didn't go through the list. Anyway, the
previous one was missing one modification, so here goes a new one.

Original message:

The attached patch adds (or, strictly speaking, fixes, as the source
tree had already initial support for this) support for compiling QEMU
outside the source tree (or in a subdir). As a side effect, it also
removes the requirement to call configure with an absolute path. The
changes are fairly small and don't affect the normal build.

--
Anderson Lizardo
Embedded Linux Lab - 10LE
Nokia Institute of Technology - INdT
Manaus - Brazil

[-- Attachment #2: qemu_build_outside_tree-2.patch --]
[-- Type: text/x-patch, Size: 3182 bytes --]

Index: Makefile
===================================================================
RCS file: /sources/qemu/qemu/Makefile,v
retrieving revision 1.93
diff -u -r1.93 Makefile
--- Makefile	11 Mar 2006 14:51:13 -0000	1.93
+++ Makefile	12 Mar 2006 00:40:06 -0000
@@ -1,6 +1,6 @@
 -include config-host.mak
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
@@ -18,10 +18,10 @@
 	$(MAKE) -C $$d $@ || exit 1 ; \
         done
 
-qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c
+qemu-img$(EXESUF): $(addprefix $(SRC_PATH)/,qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c)
 	$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
 
-dyngen$(EXESUF): dyngen.c
+dyngen$(EXESUF): $(SRC_PATH)/dyngen.c
 	$(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
 
 clean:
@@ -58,7 +58,7 @@
 	mkdir -p "$(mandir)/man1"
 	install qemu.1 qemu-img.1 "$(mandir)/man1"
 	mkdir -p "$(datadir)/keymaps"
-	install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
+	install -m 644 $(addprefix $(SRC_PATH)/keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
 endif
 	for d in $(TARGET_DIRS); do \
 	$(MAKE) -C $$d $@ || exit 1 ; \
@@ -77,15 +77,15 @@
 	cscope -b
 
 # documentation
-%.html: %.texi
+%.html: $(SRC_PATH)/%.texi
 	texi2html -monolithic -number $<
 
-qemu.1: qemu-doc.texi
-	./texi2pod.pl $< qemu.pod
+qemu.1: $(SRC_PATH)/qemu-doc.texi
+	$(SRC_PATH)/texi2pod.pl $< qemu.pod
 	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
-qemu-img.1: qemu-img.texi
-	./texi2pod.pl $< qemu-img.pod
+qemu-img.1: $(SRC_PATH)/qemu-img.texi
+	$(SRC_PATH)/texi2pod.pl $< qemu-img.pod
 	pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
 
 FILE=qemu-$(shell cat VERSION)
Index: Makefile.target
===================================================================
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.93
diff -u -r1.93 Makefile.target
--- Makefile.target	6 Feb 2006 04:11:15 -0000	1.93
+++ Makefile.target	12 Mar 2006 00:40:11 -0000
@@ -17,7 +17,7 @@
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I..
 #CFLAGS+=-Werror
 LDFLAGS=-g
 LIBS=
Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.84
diff -u -r1.84 configure
--- configure	11 Mar 2006 14:51:13 -0000	1.84
+++ configure	12 Mar 2006 00:40:16 -0000
@@ -136,13 +136,10 @@
 fi
 
 # find source path
-# XXX: we assume an absolute path is given when launching configure,
-# except in './configure' case.
 source_path=${0%configure}
-source_path=${source_path%/}
+source_path=`cd $source_path; pwd`
 source_path_used="yes"
-if test -z "$source_path" -o "$source_path" = "." ; then
-    source_path=`pwd`
+if [ "$source_path" = "`pwd`" ] ; then
     source_path_used="no"
 fi