Commit-ID: 71d1f8b5efcafc35a6e5726ab14f1bcb5e832a93 Gitweb: http://git.kernel.org/tip/71d1f8b5efcafc35a6e5726ab14f1bcb5e832a93 Author: Amerigo Wang <amwang@xxxxxxxxxx> AuthorDate: Thu, 19 May 2011 14:36:28 +0800 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Thu, 19 May 2011 22:11:19 +0300 kvm tools: build rbtree.o from source Don't link the rbtree.o from kernel object tree, build rbtree.o from source by ourselves. Acked-by: Ingo Molnar <mingo@xxxxxxx> Reported-by: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: WANG Cong <amwang@xxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 30f0f61..8cfa9a2 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -45,9 +45,10 @@ OBJS += disk/blk.o OBJS += mptable.o OBJS += threadpool.o OBJS += irq.o -OBJS += ../../lib/rbtree.o +OBJS += rbtree.o OBJS += util/rbtree-interval.o + FLAGS_BFD=$(CFLAGS) -lbfd has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD)) ifeq ($(has_bfd),y) @@ -123,6 +124,8 @@ kvm-help.d: $(KVM_INCLUDE)/common-cmds.h $(OBJS): +rbtree.o: ../../lib/rbtree.c + $(Q) $(CC) -c $(CFLAGS) $< -o $@ %.o: %.c $(E) " CC " $@ $(Q) $(CC) -c $(CFLAGS) $< -o $@ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|