From 32fccd4f7b4114526068a704c06e184bceeed053 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Thu, 19 May 2011 14:36:28 +0800
Subject: [PATCH] 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@elte.hu>
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 30f0f61..8cfa9a2 100644
--- a/Makefile
+++ b/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 $@