diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-03-17 10:57:59 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-03-17 10:57:59 +0000 |
| commit | 2dfb6b6e90758fda888d9baae565140f95cb7986 (patch) | |
| tree | d9c3e1b53f08ed85d4b13eb6ea3d9007002e0b2e /tools/blktap/drivers | |
| parent | 168c389917eae8b7df0662d1974d6ff7df1d6030 (diff) | |
| download | xen-2dfb6b6e90758fda888d9baae565140f95cb7986.tar.gz xen-2dfb6b6e90758fda888d9baae565140f95cb7986.tar.bz2 xen-2dfb6b6e90758fda888d9baae565140f95cb7986.zip | |
Clean up blktap Makefiles.
Signed-off-by: Bastian Blank <waldi@debian.org>
Diffstat (limited to 'tools/blktap/drivers')
| -rw-r--r-- | tools/blktap/drivers/Makefile | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 26ef0c8ede..b2318f0e8d 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -1,26 +1,24 @@ XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk -INCLUDES += -I.. -I../lib -I$(XEN_INCLUDE) - IBIN = blktapctrl tapdisk QCOW_UTIL = img2qcow qcow2raw qcow-create LIBAIO_DIR = ../../libaio/src CFLAGS += -Werror CFLAGS += -Wno-unused -CFLAGS += $(CFLAGS_libxenctrl) -I $(LIBAIO_DIR) -CFLAGS += $(INCLUDES) -I. -I../../xenstore +CFLAGS += -I../lib +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenstore) +CFLAGS += -I $(LIBAIO_DIR) CFLAGS += -D_GNU_SOURCE # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d DEPS = .*.d -LIBS := -L. -L.. -L../lib -LIBS += -Wl,-rpath-link,$(XEN_XENSTORE) - -LIBS_IMG := $(LIBAIO_DIR)/libaio.a -lcrypto -lpthread -lz +LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib -lblktap +LDFLAGS_img := $(LIBAIO_DIR)/libaio.a -lcrypto -lpthread -lz BLK-OBJS-y := block-aio.o BLK-OBJS-y += block-sync.o @@ -34,17 +32,17 @@ BLK-OBJS-$(CONFIG_Linux) += blk_linux.c all: $(IBIN) qcow-util -blktapctrl: blktapctrl.c - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lblktap $(LDFLAGS_libxenctrl) +blktapctrl: blktapctrl.o + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDFLAGS_blktapctrl) -tapdisk: tapdisk.c $(BLK-OBJS-y) tapdisk.c - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_IMG) +tapdisk: tapdisk.o $(BLK-OBJS-y) + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDFLAGS_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) $(LIBS_IMG) +img2qcow qcow2raw qcow-create: %: %.o $(BLK-OBJS-y) + $(CC) $(CFLAGS) -o $* $^ $(LDFLAGS) $(LDFLAGS_img) install: all $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR) |