From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 3 Jun 2008 14:30:38 +0000 (+0100)
Subject: move OBJS manipulation into xen-hooks.mak
X-Git-Tag: xen-3.3.0-rc1~111
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=68ea20317c506bb72ac70eca1d7bb0dbea9c61e9;p=qemu-xen-3.4-testing.git

move OBJS manipulation into xen-hooks.mak
---

diff --git a/i386-dm/hooks.mak b/i386-dm/hooks.mak
index 31083096..831e09f2 100644
--- a/i386-dm/hooks.mak
+++ b/i386-dm/hooks.mak
@@ -1,6 +1,4 @@
 CPPFLAGS += -DHAS_AUDIO
 QEMU_PROG=qemu-dm
 
-OBJS += xen_blktap.o
-
 include ../xen-hooks.mak
diff --git a/xen-hooks.mak b/xen-hooks.mak
index 27bf6e23..8b4ee20f 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -1,6 +1,7 @@
 CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc
 CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore
 CPPFLAGS+= -I$(XEN_ROOT)/tools/include
+CPPFLAGS+= -I$(XEN_ROOT)/tools/blktap/lib
 
 SSE2 := $(call cc-option,$(CC),-msse2,)
 ifeq ($(SSE2),-msse2)
@@ -14,6 +15,7 @@ CFLAGS += -Wno-unused -Wno-declaration-after-statement \
 
 LIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest
 LIBS += -L$(XEN_ROOT)/tools/xenstore -lxenstore
+LIBS += -L$(XEN_ROOT)/tools/blktap/lib -lblktap
 
 LDFLAGS := $(CFLAGS) $(LDFLAGS)
 
@@ -25,6 +27,7 @@ OBJS += xen_machine_pv.o
 OBJS += xenfb.o
 OBJS += xen_console.o
 OBJS += xen_machine_fv.o
+OBJS += xen_blktap.o
 
 ifdef CONFIG_PASSTHROUGH
 OBJS+= pass-through.o