Il 23/05/2014 05:02, Fam Zheng ha scritto:
Don't include individual objects, just link to archives.Signed-off-by: Fam Zheng <f...@redhat.com> --- libcacard/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libcacard/Makefile b/libcacard/Makefile index 881b222..abb6eea 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -3,12 +3,7 @@ libcacard_includedir=$(includedir)/cacard TOOLS += vscclient$(EXESUF) # objects linked into a shared library, built with libtool with -fPIC if required -libcacard-obj-y = $(stub-obj-y) $(libcacard-y) -libcacard-obj-y += util/osdep.o util/cutils.o util/qemu-timer-common.o -libcacard-obj-y += util/error.o util/qemu-error.o -libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o -libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o -libcacard-obj-y += $(filter trace/%, $(util-obj-y)) +libcacard-obj-y = $(libcacard-y) libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y)) @@ -17,7 +12,7 @@ $(libcacard-obj-y): | $(libcacard-lobj-y) all: libcacard.la libcacard.pc -vscclient$(EXESUF): libcacard/vscclient.o libcacard.la +vscclient$(EXESUF): libcacard/vscclient.o libcacard.la libqemuutil.a libqemustub.a $(call LINK,$^) #########################################################################
Michael was going to drop the dependency altogether. Also, I am not sure this patch is correct because libcacard is built using libtool and thus should use .la files rather than .a.
Paolo
