blktap: Clean up makefile and linked libs.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index d5c3f77e2d9806ebcd30b9b25667b7d3d44b6404..cfd41f64987f23226949b402d6c1766d243c3444 100644 (file)
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -17,15 +17,11 @@ CFLAGS   += -D_GNU_SOURCE
 CFLAGS   += -Wp,-MD,.$(@F).d
 DEPS      = .*.d
 
-THREADLIB := -lpthread -lz
 LIBS      := -L. -L.. -L../lib
 LIBS      += -L$(XEN_LIBXC)
-LIBS      += -lblktap -lxenctrl
-LIBS      += -lcrypto
-LIBS      += -lz
-LIBS      += -L$(XEN_XENSTORE) -lxenstore
+LIBS      += -Wl,-rpath-link,$(XEN_XENSTORE)
 
-AIOLIBS   := $(LIBAIO_DIR)/libaio.a
+LIBS_IMG  := $(LIBAIO_DIR)/libaio.a -lcrypto -lpthread -lz
 
 BLK-OBJS-y  := block-aio.o
 BLK-OBJS-y  += block-sync.o
@@ -39,17 +35,16 @@ BLK-OBJS-$(CONFIG_Linux) += blk_linux.c
 all: $(IBIN) qcow-util
 
 blktapctrl: blktapctrl.c
-       $(CC) $(CFLAGS) -o blktapctrl $(LDFLAGS) $(LIBS) blktapctrl.c
+       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lblktap -lxenctrl
 
-tapdisk: $(BLK-OBJS-y) tapdisk.c
-       $(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS-y) tapdisk.c \
-               $(AIOLIBS) $(LDFLAGS) $(LIBS)
+tapdisk: tapdisk.c $(BLK-OBJS-y) tapdisk.c
+       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_IMG)
 
 .PHONY: qcow-util
 qcow-util: img2qcow qcow2raw qcow-create
 
 img2qcow qcow2raw qcow-create: %: $(BLK-OBJS-y)
-       $(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
+       $(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(LIBS_IMG)
 
 install: all
        $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index dee5b8112d2a1b6f5cae9272a935b92d8b595940..008baac776368f953a95d05a405e9c89102a38e9 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -7,7 +7,7 @@ SONAME   = libblktap.so.$(MAJOR)
 
 INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
 
-LIBS     := -lz
+LIBS     := -lxenstore
 
 SRCS     :=
 SRCS     += xenbus.c blkif.c xs_api.c
@@ -50,7 +50,7 @@ clean:
 
 libblktap.a: $(OBJS) 
        $(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
-             -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
+             -L$(XEN_XENSTORE) $(LDFLAGS)                                 \
              -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
        ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
        ln -sf libblktap.so.$(MAJOR) libblktap.so