From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45932 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OxQ8e-00082o-HC for qemu-devel@nongnu.org; Sun, 19 Sep 2010 16:05:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OxQ8d-0003FT-9l for qemu-devel@nongnu.org; Sun, 19 Sep 2010 16:05:28 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:59339) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OxQ8c-0003FF-UK for qemu-devel@nongnu.org; Sun, 19 Sep 2010 16:05:27 -0400 Message-ID: <4C966CFB.5060108@mail.berlios.de> Date: Sun, 19 Sep 2010 22:05:15 +0200 From: Stefan Weil MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] mingw: add version information to the executables References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: rr@bttr-software.de, "C.W. Betts" , qemu-devel Could it be that the patch lines were wrapped by your mailer? I cannot apply it here. Regards, Stefan Am 19.09.2010 10:42, schrieb Blue Swirl: > Add QEMU version information to the executables, based on earlier > work by C. W. Betts and Robert Riebisch. > > Signed-off-by: Blue Swirl > --- > Makefile | 10 +++++++--- > Makefile.objs | 1 + > configure | 12 ++++++++++++ > version.rc | 28 ++++++++++++++++++++++++++++ > 4 files changed, 48 insertions(+), 3 deletions(-) > create mode 100644 version.rc > > diff --git a/Makefile b/Makefile > index ab91d42..732858b 100644 > --- a/Makefile > +++ b/Makefile > @@ -114,16 +114,20 @@ trace.o: trace.c $(GENERATED_HEADERS) > > simpletrace.o: simpletrace.c $(GENERATED_HEADERS) > > +version.o: $(SRC_PATH)/version.rc config-host.mak > + $(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@") > + > +version-obj-$(CONFIG_WIN32) += version.o > ###################################################################### > > qemu-img.o: qemu-img-cmds.h > qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) > > -qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) > $(block-obj-y) $(qobject-obj-y) > Line wrapped? git complains. More lines like this follow. > +qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) > $(block-obj-y) $(qobject-obj-y) $(version-obj-y) > > -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) > $(block-obj-y) $(qobject-obj-y) > +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) > $(block-obj-y) $(qobject-obj-y) $(version-obj-y) > > -qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o > $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) > +qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o > $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) > [snip]