diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-13 11:30:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-13 11:30:07 +0100 |
| commit | 41a3f3c1bc82caf79eb858f81f43d57265c42d31 (patch) | |
| tree | 38f814690000870ff572a59e4ae1ab3726dd704e /hw | |
| parent | 1b5498f6874ad661bcd9558bc2b0a4e25643a5bf (diff) | |
| parent | 9d171bd9375e4d08feff9adda15163e0811f5f42 (diff) | |
| download | qemu-41a3f3c1bc82caf79eb858f81f43d57265c42d31.zip qemu-41a3f3c1bc82caf79eb858f81f43d57265c42d31.tar.gz qemu-41a3f3c1bc82caf79eb858f81f43d57265c42d31.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/configure' into staging
* remotes/bonzini/configure:
libcacard: remove libcacard-specific CFLAGS and LIBS from global vars
build: simplify and fix fix-obj-vars
build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax
build: add support for per-object -cflags and -libs to all rules
Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG)
Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL)
Makefile: strip tools and modules too
build: simplify Makefile.target around unnest-vars invocations
build: simplify Makefile.target a bit, use just one rule for softmmu
build: Fix per-object variables for Makefile.target
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 17d460c..3fe4dff 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -24,6 +24,7 @@ ifeq ($(CONFIG_USB_SMARTCARD),y) common-obj-y += dev-smartcard-reader.o common-obj-y += ccid-card-passthru.o common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o +ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard endif ifeq ($(CONFIG_POSIX),y) |