Re: [Qemu-devel] [PATCH for 1.6] w32: Add missing version.o to all executables (fix regression)

[Paolo Bonzini]

----- Original Message -----
> From: "Stefan Weil" <address@hidden>
> To: "qemu-devel" <address@hidden>
> Cc: "Anthony Liguori" <address@hidden>, "Paolo Bonzini" <address@hidden>, 
> "Stefan Weil" <address@hidden>
> Sent: Wednesday, August 7, 2013 11:07:04 PM
> Subject: [PATCH for 1.6] w32: Add missing version.o to all executables (fix 
> regression)
> 
> QEMU executables for w32, w64 had included meta information built from
> version.rc. These rules were changed several times some months ago.
> 
> The latest version added version.o to the tools, but not to the system
> emulations.
> 
> This patch adds the meta information to all system emulations again.
> 
> It builds a version.o for each target (which allows different information
> for each target in the future).
> 
> I removed the libtool part with version-lobj-y (why was it added?).

For libcacard.

I think the bug is simply that these two lines:

>  version-obj-$(CONFIG_WIN32) += version.o
> -version-lobj-$(CONFIG_WIN32) += version.lo

should be moved to Makefile.objs.

Then if you want you can have separate version.o files in 1.7.
For 1.6 that's not necessary.

Paolo

> -Makefile: $(version-obj-y) $(version-lobj-y)
> +Makefile: $(version-obj-y)
>  
>  ######################################################################
>  # Build libraries
> diff --git a/Makefile.target b/Makefile.target
> index 9a49852..01037fe 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -13,6 +13,12 @@ QEMU_CFLAGS += -I..
> -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H
>  
>  QEMU_CFLAGS+=-I$(SRC_PATH)/include
>  
> +version.o: $(SRC_PATH)/version.rc ../config-host.h
> +
> +version-obj-$(CONFIG_WIN32) += version.o
> +
> +Makefile: $(version-obj-y)
> +
>  ifdef CONFIG_USER_ONLY
>  # user emulator name
>  QEMU_PROG=qemu-$(TARGET_NAME)
> diff --git a/rules.mak b/rules.mak
> index 4499745..0bcd876 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -20,7 +20,7 @@ QEMU_INCLUDES += -I$(<D) -I$(@D)
>  %.o: %.c
>       $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) 
> $(QEMU_DGFLAGS)
>       $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
>  %.o: %.rc
> -     $(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
> +     $(call quiet-command,$(WINDRES) -I $(BUILD_DIR) -o $@ $<,"  RC
> $(TARGET_DIR)$@")
>  
>  ifeq ($(LIBTOOL),)
>  LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
>  \
> @@ -38,8 +38,7 @@ LIBTOOL += $(if $(V),,--quiet)
>  LINK = $(call quiet-command,\
>         $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
>         )$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
> -       $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
> -       $(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
> +       $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
>         $(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
>         $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", "  LINK
>         ")"$(TARGET_DIR)$@")
>  endif
> --
> 1.7.10.4
> 
>