From bf955b60724dad9d02a136c21e13dab476f57052 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 10 Jun 2010 08:27:25 +0100
Subject: [PATCH] blktap2: Build libblktapctl.so

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
---
 tools/Rules.mk                  |  4 ++++
 tools/blktap2/control/Makefile  | 23 ++++++++++++++++-------
 tools/blktap2/control/tap-ctl.h |  3 +--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 53d8aa86ce..8a691a9ab0 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -13,6 +13,7 @@ XEN_XC             = $(XEN_ROOT)/tools/python/xen/lowlevel/xc
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 XEN_XENSTORE       = $(XEN_ROOT)/tools/xenstore
 XEN_LIBXENSTAT     = $(XEN_ROOT)/tools/xenstat/libxenstat/src
+XEN_BLKTAP2        = $(XEN_ROOT)/tools/blktap2
 
 CFLAGS_include = -I$(XEN_INCLUDE)
 
@@ -25,6 +26,9 @@ LDFLAGS_libxenguest = -L$(XEN_LIBXC) -lxenguest
 CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_include)
 LDFLAGS_libxenstore = -L$(XEN_XENSTORE) -lxenstore
 
+CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_include)
+LDFLAGS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
+
 X11_LDPATH = -L/usr/X11R6/$(LIBLEAFDIR)
 
 CFLAGS += -D__XEN_TOOLS__
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index 95cfc1bce4..16db94ec84 100644
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -30,25 +30,34 @@ CTL_OBJS  += tap-ctl-unpause.o
 CTL_OBJS  += tap-ctl-major.o
 CTL_OBJS  += tap-ctl-check.o
 
-OBJS = $(CTL_OBJS)
-LIBS = libblktapctl.a
+CTL_PICS  = $(patsubst %.o,%.opic,$(CTL_OBJS))
+
+OBJS = $(CTL_OBJS) tap-ctl.o
+PICS = $(CTL_PICS)
+
+LIBS = libblktapctl.a libblktapctl.so
+IBIN = tap-ctl
 
 all: build
 
-build: $(IBIN)
+build: $(IBIN) $(LIBS)
 
-tap-ctl: tap-ctl.o libblktapctl.a
+tap-ctl: tap-ctl.o libblktapctl.so
 	$(CC) $(CFLAGS) -o $@ $^
 
 libblktapctl.a: $(CTL_OBJS)
-	ar r $@ $^
+	$(AR) r $@ $^
+
+libblktapctl.so: $(CTL_PICS)
+	$(CC) $(CFLAGS) -fPIC -shared -rdynamic $^ -o $@
 
-install: all
+install: $(IBIN) $(LIBS)
 	$(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
 	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
+	$(INSTALL_PROG) $(LIBS) $(DESTDIR)$(LIBDIR)
 
 clean:
-	rm -f $(OBJS) $(DEPS) $(IBIN) $(LIBS)
+	rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIBS)
 	rm -f *~
 
 .PHONY: all build clean install
diff --git a/tools/blktap2/control/tap-ctl.h b/tools/blktap2/control/tap-ctl.h
index 96142e47ad..d951e774cb 100644
--- a/tools/blktap2/control/tap-ctl.h
+++ b/tools/blktap2/control/tap-ctl.h
@@ -30,8 +30,7 @@
 
 #include <syslog.h>
 #include <errno.h>
-
-#include "tapdisk-message.h"
+#include <tapdisk-message.h>
 
 extern int tap_ctl_debug;
 
-- 
2.39.5