diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-26 10:17:33 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-26 10:17:33 +0000 |
| commit | bc4a5b7bf50bf466cfc63f20a3907d904d5f0cdf (patch) | |
| tree | 4a34c2121bc4dad9deb429e1aae4ac87b0688b73 /tools/blktap/drivers | |
| parent | 22d4eec91116418b08239485f0bcc2cacab98162 (diff) | |
| download | xen-bc4a5b7bf50bf466cfc63f20a3907d904d5f0cdf.tar.gz xen-bc4a5b7bf50bf466cfc63f20a3907d904d5f0cdf.tar.bz2 xen-bc4a5b7bf50bf466cfc63f20a3907d904d5f0cdf.zip | |
blktap: Clean up makefile and linked libs.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools/blktap/drivers')
| -rw-r--r-- | tools/blktap/drivers/Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index d5c3f77e2d..cfd41f6498 100644 --- 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) |