Revision 5354e4d2

b/Makefile
166 166

  
167 167
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
168 168

  
169
version.o: $(SRC_PATH)/version.rc config-host.h
169
version.o: $(SRC_PATH)/version.rc config-host.h | version.lo
170 170
	$(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
171
version.lo: $(SRC_PATH)/version.rc config-host.h
172
	$(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I. -o $@ $<,"lt RC   $(TARGET_DIR)$@")
171 173

  
172 174
version-obj-$(CONFIG_WIN32) += version.o
173
Makefile: $(version-obj-y)
175
version-lobj-$(CONFIG_WIN32) += $(if $(LIBTOOL),version.lo)
176
Makefile: $(version-obj-y) $(version-lobj-y)
177

  
174 178

  
175 179
######################################################################
176 180
# Build libraries
b/rules.mak
35 35
LINK = $(call quiet-command,\
36 36
       $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
37 37
       )$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
38
       $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
38
       $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
39
       $(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
39 40
       $(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
40 41
       $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", "  LINK  ")"$(TARGET_DIR)$@")
41 42
endif

Also available in: Unified diff