# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201342653 0
# Node ID 3d71b7bf06eaa0f8054dd7585405d9e49425e20c
# Parent 97dd72c045a5c5e85e9844b23f1be64751dcdfe0
blktap: Clean up makefile and linked libs.
Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
tools/blktap/drivers/Makefile | 17 ++++++-----------
tools/blktap/lib/Makefile | 4 ++--
2 files changed, 8 insertions(+), 13 deletions(-)
diff -r 97dd72c045a5 -r 3d71b7bf06ea tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile Sat Jan 26 10:16:21 2008 +0000
+++ b/tools/blktap/drivers/Makefile Sat Jan 26 10:17:33 2008 +0000
@@ -17,15 +17,11 @@ CFLAGS += -Wp,-MD,.$(@F).d
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 @@ all: $(IBIN) qcow-util
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 -r 97dd72c045a5 -r 3d71b7bf06ea tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Sat Jan 26 10:16:21 2008 +0000
+++ b/tools/blktap/lib/Makefile Sat Jan 26 10:17:33 2008 +0000
@@ -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
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home