Commit 00c705fb authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

build: libcacard Makefile cleanups 



Build vscclient from toplevel Makefile, limit usage of vpath.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 49ac9e0a

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(t 
install-libcacard: libcacard.la

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)

endif



vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) qemu-timer-common.o libcacard/vscclient.o

	$(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS),"  LINK  $@")



######################################################################



qemu-img.o: qemu-img-cmds.h

Makefile.objs

+7 −1
Original line number Diff line number Diff line
@@ -198,7 +198,13 @@ $(trace-obj-y): $(GENERATED_HEADERS) 
######################################################################

# smartcard



libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o card_7816.o

libcacard-y += libcacard/cac.o libcacard/event.o

libcacard-y += libcacard/vcard.o libcacard/vreader.o

libcacard-y += libcacard/vcard_emul_nss.o

libcacard-y += libcacard/vcard_emul_type.o

libcacard-y += libcacard/card_7816.o



common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)



######################################################################

# qapi

Makefile.target

+0 −6
Original line number Diff line number Diff line
@@ -164,16 +164,10 @@ all-obj-y = $(obj-y) 
all-obj-y += $(addprefix ../, $(universal-obj-y))



ifdef CONFIG_SOFTMMU



all-obj-y += $(addprefix ../, $(common-obj-y))

all-obj-y += $(addprefix ../libdis/, $(libdis-y))

all-obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))

all-obj-y += $(addprefix ../, $(trace-obj-y))



# libcacard needs qemu-thread support, and besides is only needed by devices

# so not requires with linux-user / bsd-user targets

all-obj-$(CONFIG_SMARTCARD_NSS) += $(addprefix ../libcacard/, $(libcacard-y))



else

all-obj-y += $(addprefix ../libuser/, $(user-obj-y))

all-obj-y += $(addprefix ../libdis-user/, $(libdis-y))

configure

+5 −7
Original line number Diff line number Diff line
@@ -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

libcacard/Makefile

+6 −11
Original line number Diff line number Diff line
@@ -2,29 +2,23 @@ 
-include $(SRC_PATH)/Makefile.objs

-include $(SRC_PATH)/rules.mak



libcacard_srcpath=$(SRC_PATH)/libcacard

libcacard_includedir=$(includedir)/cacard



$(call set-vpath, $(SRC_PATH):$(libcacard_srcpath))



# objects linked against normal qemu binaries, not compiled with libtool

QEMU_OBJS=$(addprefix ../,$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y))

$(call set-vpath, $(SRC_PATH))



# objects linked into a shared library, built with libtool with -fPIC if required

QEMU_OBJS_LIB=$(addsuffix .lo,$(basename $(QEMU_OBJS)))

QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)

QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS))



QEMU_CFLAGS+=-I../



libcacard.lib-y=$(addsuffix .lo,$(basename $(libcacard-y)))



vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o

	$(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS),"  LINK  $@")

libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y))



clean:

	rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc

	rm -Rf .libs



all: vscclient

all: libcacard.la libcacard.pc

# Dummy command so that make thinks it has done something

	@true
@@ -41,6 +35,7 @@ else 
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)

	$(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs),"  lt LINK $@")



libcacard_srcpath=$(SRC_PATH)/libcacard

libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in

	sed -e 's|@LIBDIR@|$(libdir)|' \

		-e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \