diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-29 11:40:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-06-07 09:21:18 +0200 |
| commit | 00c705fb92bc6e69e955aeac3614e05ca02feacd (patch) | |
| tree | 106512286fdae214cf08ab41e7913bca388d42f0 /configure | |
| parent | 49ac9e0a8cfb737d6da9c0b056c062e3dec0ba45 (diff) | |
| download | qemu-00c705fb92bc6e69e955aeac3614e05ca02feacd.tar.gz qemu-00c705fb92bc6e69e955aeac3614e05ca02feacd.tar.bz2 qemu-00c705fb92bc6e69e955aeac3614e05ca02feacd.zip | |
build: libcacard Makefile cleanups
Build vscclient from toplevel Makefile, limit usage of vpath.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -2927,6 +2927,9 @@ if test "$softmmu" = yes ; then fi fi fi +if test "$smartcard_nss" = "yes" ; then + tools="vscclient\$(EXESUF) $tools" +fi # Mac OS X ships with a broken assembler roms= @@ -3959,9 +3962,10 @@ DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS fsdev ui hw hw/usb" DIRS="$DIRS qapi qapi-generated" DIRS="$DIRS qga trace qom" +DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -FILES="$FILES tests/tcg/lm32/Makefile" +FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" @@ -4005,12 +4009,6 @@ for hwlib in 32 64; do echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak done -if [ "$source_path" != `pwd` ]; then - # out of tree build - mkdir -p libcacard - symlink "$source_path/libcacard/Makefile" libcacard/Makefile -fi - d=libuser mkdir -p $d mkdir -p $d/trace |