| Message ID | 1443022575-8466-1-git-send-email-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 23 September 2015 at 08:36, <marcandre.lureau@redhat.com> wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > The following changes since commit 27c7275a56948f48f536e2d1599b22355f5714ac: > > Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20150903-1' into staging (2015-09-22 19:22:23 +0100) > > are available in the git repository at: > > https://github.com/elmarco/qemu tags/rm-libcacard > > for you to fetch changes up to aa43220862ffcc24229464f7d0580f881ec7fea7: > > libcacard: use the standalone project (2015-09-23 17:26:24 +0200) > > ---------------------------------------------------------------- > Remove libcacard > > ---------------------------------------------------------------- This fails to build (all platforms): /Users/pm215/src/qemu/hw/usb/ccid-card-passthru.c:15:10: fatal error: 'cacard/vscard_common.h' file not found #include "cacard/vscard_common.h" ^ 1 error generated. thanks -- PMM
Hi On Wed, Sep 23, 2015 at 7:22 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > This fails to build (all platforms): > > /Users/pm215/src/qemu/hw/usb/ccid-card-passthru.c:15:10: fatal error: > 'cacard/vscard_common.h' file not found > #include "cacard/vscard_common.h" > ^ > 1 error generated. > > thanks > -- PMM Looks like our current Makefile didn't make this explicit enough, my patch assumed that ccid-card-passthru.c didn't depend on libcacard since: 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 +common-obj-$(CONFIG_SMARTCARD) += ccid-card-emulated.o This works: common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o I am sending a new pull request.
From: Marc-André Lureau <marcandre.lureau@redhat.com> The following changes since commit 27c7275a56948f48f536e2d1599b22355f5714ac: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20150903-1' into staging (2015-09-22 19:22:23 +0100) are available in the git repository at: https://github.com/elmarco/qemu tags/rm-libcacard for you to fetch changes up to aa43220862ffcc24229464f7d0580f881ec7fea7: libcacard: use the standalone project (2015-09-23 17:26:24 +0200) ---------------------------------------------------------------- Remove libcacard ---------------------------------------------------------------- Marc-André Lureau (1): libcacard: use the standalone project .gitignore | 1 - Makefile | 3 - Makefile.objs | 14 --- configure | 52 +++----- docs/libcacard.txt | 483 ------------------------------------------------------------------------ hw/usb/Makefile.objs | 3 +- hw/usb/ccid-card-passthru.c | 2 +- libcacard/Makefile | 45 ------- libcacard/cac.c | 414 -------------------------------------------------------------- libcacard/cac.h | 31 ----- libcacard/card_7816.c | 757 ---------------------------------------------------------------------------------------------------------------- libcacard/card_7816.h | 62 ---------- libcacard/card_7816t.h | 165 ------------------------- libcacard/event.c | 103 ---------------- libcacard/eventt.h | 29 ----- libcacard/libcacard.pc.in | 13 -- libcacard/libcacard.syms | 77 ------------ libcacard/link_test.c | 22 ---- libcacard/vcard.c | 325 ------------------------------------------------ libcacard/vcard.h | 86 ------------- libcacard/vcard_emul.h | 66 ---------- libcacard/vcard_emul_nss.c | 1274 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- libcacard/vcard_emul_type.c | 57 --------- libcacard/vcard_emul_type.h | 32 ----- libcacard/vcardt.c | 40 ------ libcacard/vcardt.h | 59 --------- libcacard/vcardt_internal.h | 6 - libcacard/vevent.h | 27 ---- libcacard/vreader.c | 578 -------------------------------------------------------------------------------------- libcacard/vreader.h | 55 --------- libcacard/vreadert.h | 24 ---- libcacard/vscard_common.h | 178 --------------------------- libcacard/vscclient.c | 785 -------------------------------------------------------------------------------------------------------------------- 33 files changed, 20 insertions(+), 5848 deletions(-) delete mode 100644 docs/libcacard.txt delete mode 100644 libcacard/Makefile delete mode 100644 libcacard/cac.c delete mode 100644 libcacard/cac.h delete mode 100644 libcacard/card_7816.c delete mode 100644 libcacard/card_7816.h delete mode 100644 libcacard/card_7816t.h delete mode 100644 libcacard/event.c delete mode 100644 libcacard/eventt.h delete mode 100644 libcacard/libcacard.pc.in delete mode 100644 libcacard/libcacard.syms delete mode 100644 libcacard/link_test.c delete mode 100644 libcacard/vcard.c delete mode 100644 libcacard/vcard.h delete mode 100644 libcacard/vcard_emul.h delete mode 100644 libcacard/vcard_emul_nss.c delete mode 100644 libcacard/vcard_emul_type.c delete mode 100644 libcacard/vcard_emul_type.h delete mode 100644 libcacard/vcardt.c delete mode 100644 libcacard/vcardt.h delete mode 100644 libcacard/vcardt_internal.h delete mode 100644 libcacard/vevent.h delete mode 100644 libcacard/vreader.c delete mode 100644 libcacard/vreader.h delete mode 100644 libcacard/vreadert.h delete mode 100644 libcacard/vscard_common.h delete mode 100644 libcacard/vscclient.c