diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-27 00:27:48 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-27 00:28:34 +0200 |
| commit | c02817e5bfbb27955cac970019e6670dc427bc41 (patch) | |
| tree | aa81ba3ca3958d5046c45e45cba8d9261e515159 | |
| parent | 6821cdc7c857c6af47277e98dde24cc99ddc0531 (diff) | |
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: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | rules.mak | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -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 ###################################################################### @@ -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 $@") |