diff options
| author | akw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk> | 2005-03-21 19:57:02 +0000 |
|---|---|---|
| committer | akw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk> | 2005-03-21 19:57:02 +0000 |
| commit | d4282ab308d880580089973ca9a8ab804edd7e22 (patch) | |
| tree | 73e7f11af8ba799ab3053a4d0f4dbc487bdc8f02 /tools/blktap/Makefile | |
| parent | acf79a97a303fb54a5f667e28074a680e6c7ba4b (diff) | |
| download | xen-d4282ab308d880580089973ca9a8ab804edd7e22.tar.gz xen-d4282ab308d880580089973ca9a8ab804edd7e22.tar.bz2 xen-d4282ab308d880580089973ca9a8ab804edd7e22.zip | |
bitkeeper revision 1.1236.38.1 (423f270ey18R1fJMKT6mo5gO0HvPiQ)
Incremental fixes to plx stuff.
Signed-off-by: andrew.warfield@cl.cam.ac.uk
Diffstat (limited to 'tools/blktap/Makefile')
| -rw-r--r-- | tools/blktap/Makefile | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 50d77b905b..2699563f6d 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -21,8 +21,12 @@ SRCS += blktaplib.c PLX_SRCS := PLX_SRCS += vdi.c PLX_SRCS += radix.c -PLX_SRCS += blockstore.c PLX_SRCS += snaplog.c +PLXT_SRCS := $(PLX_SRCS) +#PLXT_SRCS += blockstore-tls.c +PLXT_SRCS += blockstore.c +PLXT_SRCS += parallax-threaded.c +PLX_SRCS += blockstore.c VDI_SRCS := $(PLX_SRCS) PLX_SRCS += parallax.c @@ -31,6 +35,7 @@ VDI_TOOLS += vdi_create VDI_TOOLS += vdi_list VDI_TOOLS += vdi_snap VDI_TOOLS += vdi_snap_list +VDI_TOOLS += vdi_snap_delete VDI_TOOLS += vdi_fill VDI_TOOLS += vdi_tree VDI_TOOLS += vdi_validate @@ -91,7 +96,7 @@ libblktap.so: libblktap.so.$(MAJOR): ln -sf libblktap.so.$(MAJOR).$(MINOR) $@ libblktap.so.$(MAJOR).$(MINOR): $(OBJS) - $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -L../libxutil -lxutil -lz + $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lpthread -L../libxutil -lxutil -lz blkdump: $(LIB) $(CC) $(CFLAGS) -o blkdump -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -l blktap blkdump.c @@ -117,6 +122,9 @@ blkaio: $(LIB) blkaio.c blkaiolib.c parallax: $(LIB) $(PLX_SRCS) $(CC) $(CFLAGS) -o parallax -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -lblktap $(PLX_SRCS) libgnbd/libgnbd.a +parallax-threaded: $(LIB) $(PLXT_SRCS) + $(CC) $(CFLAGS) -o parallax-threaded -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -lpthread -lblktap $(PLXT_SRCS) libgnbd/libgnbd.a + vdi_test: $(LIB) $(VDI_SRCS) $(CC) $(CFLAGS) -g3 -o vdi_test -DVDI_STANDALONE $(VDI_SRCS) @@ -132,6 +140,9 @@ vdi_snap: $(LIB) vdi_snap.c $(VDI_SRCS) vdi_snap_list: $(LIB) vdi_snap_list.c $(VDI_SRCS) $(CC) $(CFLAGS) -g3 -o vdi_snap_list vdi_snap_list.c $(VDI_SRCS) +vdi_snap_delete: $(LIB) vdi_snap_delete.c $(VDI_SRCS) + $(CC) $(CFLAGS) -g3 -o vdi_snap_delete vdi_snap_delete.c $(VDI_SRCS) + vdi_tree: $(LIB) vdi_tree.c $(VDI_SRCS) $(CC) $(CFLAGS) -g3 -o vdi_tree vdi_tree.c $(VDI_SRCS) @@ -142,12 +153,22 @@ vdi_validate: $(LIB) vdi_validate.c $(VDI_SRCS) $(CC) $(CFLAGS) -g3 -o vdi_validate vdi_validate.c $(VDI_SRCS) -rdx_cmp: $(LIB) rdx_cmp.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o rdx_cmp rdx_cmp.c $(VDI_SRCS) - - .PHONY: TAGS clean install mk-symlinks rpm TAGS: etags -t $(SRCS) *.h -include $(DEPS) + +#Random testing targets. To be removed eventually. + +rdx_cmp: $(LIB) rdx_cmp.c $(VDI_SRCS) + $(CC) $(CFLAGS) -g3 -o rdx_cmp rdx_cmp.c $(VDI_SRCS) + +bb-tls: $(LIB) blockstore-benchmark.c + $(CC) $(CFLAGS) -o bb-tls blockstore-benchmark.c blockstore-tls.c -lpthread + +bb-trans: $(LIB) blockstore-benchmark.c + $(CC) $(CFLAGS) -o bb-trans blockstore-benchmark.c blockstore.c -lpthread + +radix-test: $(LIB) radix.c blockstore-threaded-trans.c + $(CC) $(CFLAGS) -g3 -D RADIX_STANDALONE -o radix-test radix.c blockstore-threaded-trans.c |