Commit c02817e5 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

win32: move Makefile dependencies on version-obj-y to rules.mak 



This makes the test on $(LIBTOOL) work.  Otherwise, LIBTOOL
is /bin/false by the time the test is done.

Fixes Win32 compilation without a working cross-libtool.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6821cdc7

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ version.o: $(SRC_PATH)/version.rc config-host.h | version.lo 
version.lo: $(SRC_PATH)/version.rc config-host.h



version-obj-$(CONFIG_WIN32) += version.o

version-lobj-$(CONFIG_WIN32) += $(if $(LIBTOOL),version.lo)

Makefile: $(version-obj-y) $(version-lobj-y)

version-lobj-$(CONFIG_WIN32) += version.lo





######################################################################

rules.mak

+3 −0
Original line number Diff line number Diff line
@@ -22,12 +22,15 @@ QEMU_CFLAGS += -I$(<D) -I$(@D) 
%.o: %.rc

	$(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")



Makefile: $(version-obj-y)



ifeq ($(LIBTOOL),)

LIBTOOL = /bin/false

LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \

       $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \

       $(LIBS),"  LINK  $(TARGET_DIR)$@")

else

Makefile: $(version-lobj-y)

LIBTOOL += $(if $(V),,--quiet)

%.lo: %.c

	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  lt CC $@")