[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/28] libcacard: fix mingw64 cross-compilation
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH v3 08/28] libcacard: fix mingw64 cross-compilation |
Date: |
Mon, 22 Apr 2013 18:04:38 +0300 |
From: Marc-André Lureau <address@hidden>
Compile and link with version.lo
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 8 ++++++--
rules.mak | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 88375dc..b6ad03a 100644
--- a/Makefile
+++ b/Makefile
@@ -166,11 +166,15 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
-version.o: $(SRC_PATH)/version.rc config-host.h
+version.o: $(SRC_PATH)/version.rc config-host.h | version.lo
$(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@")
+version.lo: $(SRC_PATH)/version.rc config-host.h
+ $(call quiet-command,$(LIBTOOL) --mode=compile --tag=RC $(WINDRES) -I.
-o $@ $<,"lt RC $(TARGET_DIR)$@")
version-obj-$(CONFIG_WIN32) += version.o
-Makefile: $(version-obj-y)
+version-lobj-$(CONFIG_WIN32) += $(if $(LIBTOOL),version.lo)
+Makefile: $(version-obj-y) $(version-lobj-y)
+
######################################################################
# Build libraries
diff --git a/rules.mak b/rules.mak
index 36aba2d..292a422 100644
--- a/rules.mak
+++ b/rules.mak
@@ -35,7 +35,8 @@ 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) $(version-obj-y) \
+ $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
+ $(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
$(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
$(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK
")"$(TARGET_DIR)$@")
endif
--
1.8.2
- [Qemu-devel] [PATCH v3 00/28] ccid and libcacard fixes for windows/mingw, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 02/28] ccid-card-emul: do not crash if backend is not provided, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 01/28] libcacard: correct T0 historical bytes size, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 04/28] ccid: declare DEFAULT_ATR table to be "static const", Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 03/28] ccid: make backend_enum_table "static const" and adjust users, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 07/28] build-sys: must link with -fstack-protector, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 08/28] libcacard: fix mingw64 cross-compilation,
Alon Levy <=
- [Qemu-devel] [PATCH v3 06/28] util: move socket_init() to osdep.c, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 05/28] libcacard: use system config directory for nss db on win32, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 09/28] libcacard: split vscclient main() from socket reading, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 13/28] libcacard: remove default libcoolkey loading, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 12/28] libcacard: remove sql: prefix, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 11/28] libcacard: teach vscclient to use GMainLoop for portability, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 15/28] dev-smartcard-reader: nicer debug messages, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 16/28] dev-smartcard-reader: remove aborts (never triggered, but just in case), Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 17/28] dev-smartcard-reader: support windows guest, Alon Levy, 2013/04/22
- [Qemu-devel] [PATCH v3 14/28] dev-smartcard-reader: white space fixes, Alon Levy, 2013/04/22