move OBJS manipulation into xen-hooks.mak

diff --git a/i386-dm/hooks.mak b/i386-dm/hooks.mak
index 3108309690b00c9cdcc471ce64dc78bba407a1cb..831e09f2c51acbbd3d29641d433f81db7943d07c 100644 (file)
--- 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 27bf6e2340240cafa5fe3c5f3e96fe3a882cfd14..8b4ee20f2f0a621500b107e83a5c4673f22c5e3a 100644 (file)
--- 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