From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58673 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdefV-0005dX-Mo for qemu-devel@nongnu.org; Fri, 14 Jan 2011 03:06:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdefT-0005hw-JI for qemu-devel@nongnu.org; Fri, 14 Jan 2011 03:05:56 -0500 Received: from smtp.ispras.ru ([83.149.198.201]:51052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdefT-0005dd-4u for qemu-devel@nongnu.org; Fri, 14 Jan 2011 03:05:55 -0500 Received: from PASHAISP (ispserv.ispras.ru [83.149.198.72]) by smtp.ispras.ru (Postfix) with ESMTP id BADEB5D4088 for ; Fri, 14 Jan 2011 10:57:22 +0300 (MSK) From: "Pavel Dovgaluk" Date: Fri, 14 Jan 2011 11:04:11 +0300 Message-ID: <001201cbb3c1$a0b2e610$e218b230$@Dovgaluk@ispras.ru> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_NextPart_000_0013_01CBB3DA.C6001E10" Content-Language: ru Subject: [Qemu-devel] [PATCH] Fix multiple qemu-options.def generation List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. ------=_NextPart_000_0013_01CBB3DA.C6001E10 Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 7bit This patch fixes generation of multiple instances of qemu-options.def by make script (at least for building in Windows). Previous version had the following problem: you can built qemu, break the contents of qemu-options.hx and build qemu successfully again. Broken qemu-options.hx will not affect the build for the first time. This works in both directions: after build was broken, you can fix qemu-options.hx, but qemu will not build successfully, until you delete qemu-options.def files. Signed-off-by: Pavel Dovgaluk --- Makefile.objs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 4a1eaa1..ee9f190 100755 --- a/Makefile.objs +++ b/Makefile.objs @@ -269,10 +269,10 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) -vl.o: qemu-options.def +vl.o: ../qemu-options.def os-posix.o: qemu-options.def os-win32.o: qemu-options.def -qemu-options.def: $(SRC_PATH)/qemu-options.hx +%qemu-options.def: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") -- 1.7.3.3 ------=_NextPart_000_0013_01CBB3DA.C6001E10 Content-Type: text/html; charset="koi8-r" Content-Transfer-Encoding: quoted-printable

This patch fixes generation of multiple instances of = qemu-options.def by make script (at least for building in = Windows).

Previous version had the following problem: you can built = qemu, break the contents of qemu-options.hx and build qemu successfully = again.

Broken qemu-options.hx will not affect the build for the = first time.

This works in both directions: after build was broken, you = can fix qemu-options.hx, but qemu will not build successfully, until you = delete qemu-options.def files.

 

Signed-off-by: Pavel Dovgaluk = <pavel.dovgaluk@gmail.com>

---

Makefile.objs |=9A=9A=9A 4 = ++--

1 = files changed, 2 insertions(+), 2 deletions(-)

 

diff --git a/Makefile.objs = b/Makefile.objs

index 4a1eaa1..ee9f190 100755

--- = a/Makefile.objs

+++ b/Makefile.objs

@@ -269,10 +269,10 @@ vl.o: = QEMU_CFLAGS+=3D$(GPROF_CFLAGS)

=9Avl.o: = QEMU_CFLAGS+=3D$(SDL_CFLAGS)

-vl.o: = qemu-options.def

+vl.o: ../qemu-options.def

os-posix.o: = qemu-options.def

os-win32.o: qemu-options.def

-qemu-options.def: = $(SRC_PATH)/qemu-options.hx

+%qemu-options.def: = $(SRC_PATH)/qemu-options.hx

= =9A=9A=9A=9A=9A=9A=9A=9A=9A=9A=9A=9A=9A=9A $(call quiet-command,sh = $(SRC_PATH)/hxtool -h < $< > $@,"=9A GEN=9A=9A = $(TARGET_DIR)$@")

--

1.7.3.3

 

------=_NextPart_000_0013_01CBB3DA.C6001E10--