On Mon, May 02, 2011 at 09:54:03AM +0200, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > Cc: qemu-triv...@nongnu.org > --- > Makefile | 2 ++ > Makefile.objs | 7 +++---- > libcacard/Makefile | 9 +-------- > 3 files changed, 6 insertions(+), 12 deletions(-) >
Reviewed-by: Alon Levy <al...@redhat.com> > diff --git a/Makefile b/Makefile > index 67c0268..2b0438c 100644 > --- a/Makefile > +++ b/Makefile > @@ -88,6 +88,8 @@ include $(SRC_PATH)/Makefile.objs > endif > > $(common-obj-y): $(GENERATED_HEADERS) > +subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o > qemu-timer-common.o > + > $(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) > subdir-libdis > > $(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) > subdir-libdis-user subdir-libuser > diff --git a/Makefile.objs b/Makefile.objs > index 44ce368..0ba989f 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -7,8 +7,8 @@ qobject-obj-y += qerror.o > ####################################################################### > # oslib-obj-y is code depending on the OS (win32 vs posix) > oslib-obj-y = osdep.o > -oslib-obj-$(CONFIG_WIN32) += oslib-win32.o > -oslib-obj-$(CONFIG_POSIX) += oslib-posix.o > +oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o > +oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o > > ####################################################################### > # block-obj-y is code used by both qemu system emulation and qemu-img > @@ -143,8 +143,7 @@ common-obj-y += $(addprefix ui/, $(ui-obj-y)) > common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y)) > > common-obj-y += iov.o acl.o > -common-obj-$(CONFIG_POSIX) += qemu-thread-posix.o compatfd.o > -common-obj-$(CONFIG_WIN32) += qemu-thread-win32.o > +common-obj-$(CONFIG_POSIX) += compatfd.o > common-obj-y += notify.o event_notifier.o > common-obj-y += qemu-timer.o qemu-timer-common.o > > diff --git a/libcacard/Makefile b/libcacard/Makefile > index 4010029..1d34df0 100644 > --- a/libcacard/Makefile > +++ b/libcacard/Makefile > @@ -4,14 +4,7 @@ > > $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/libcacard) > > -ifeq ($(CONFIG_WIN32),y) > -QEMU_THREAD=qemu-thread-win32.o > -else > -QEMU_THREAD=qemu-thread-posix.o > -endif > - > - > -QEMU_OBJS=$(addprefix ../, $(QEMU_THREAD) $(oslib-obj-y) $(trace-obj-y) > qemu-malloc.o qemu-timer-common.o) > +QEMU_OBJS=$(addprefix ../, $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o > qemu-timer-common.o) > > QEMU_CFLAGS+=-I../ > > -- > 1.7.4.4 > > >
