diff options
| author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-24 21:17:20 +0000 |
|---|---|---|
| committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-05-24 21:17:20 +0000 |
| commit | 519108b9f74f9a601b69733e864ad9bcb8c8e2d7 (patch) | |
| tree | 57282d2fb82a415f54c157ea26778e3e8b488f35 /tools/blktap/Makefile | |
| parent | 46fc2b33ed8e425dddf8af3ad9202eacb262c740 (diff) | |
| download | xen-519108b9f74f9a601b69733e864ad9bcb8c8e2d7.tar.gz xen-519108b9f74f9a601b69733e864ad9bcb8c8e2d7.tar.bz2 xen-519108b9f74f9a601b69733e864ad9bcb8c8e2d7.zip | |
bitkeeper revision 1.1534.1.1 (429399e0oJudIjoFsgWFxNKnCM7qTg)
Nothing but vnet uses libxutil -- move it there.
Makefile, xc.c, setup.py, configure, configure.in, Makefile.in:
This doesn't use libxutil.
Makefile, Makefile.vnet, Rules.mk:
Move libxutil into vnet since it's only used there.
Many files:
mvdir
Diffstat (limited to 'tools/blktap/Makefile')
| -rw-r--r-- | tools/blktap/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 26187de779..9807e05387 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -47,7 +47,6 @@ CFLAGS += -Wno-unused CFLAGS += -g3 CFLAGS += -fno-strict-aliasing CFLAGS += -I $(XEN_LIBXC) -CFLAGS += -I $(XEN_LIBXUTIL) CFLAGS += $(INCLUDES) -I. CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # Get gcc to generate the dependencies for us. @@ -97,16 +96,16 @@ libblktap.so: libblktap.so.$(MAJOR): ln -sf libblktap.so.$(MAJOR).$(MINOR) $@ libblktap.so.$(MAJOR).$(MINOR): $(OBJS) - $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lpthread -L../libxutil -lxutil -lz + $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lpthread -lz blkdump: $(LIB) - $(CC) $(CFLAGS) -o blkdump -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -l blktap blkdump.c + $(CC) $(CFLAGS) -o blkdump -L$(XEN_LIBXC) -L. -l blktap blkdump.c parallax: $(LIB) $(PLX_SRCS) - $(CC) $(CFLAGS) -o parallax -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -lblktap -lpthread $(PLX_SRCS) + $(CC) $(CFLAGS) -o parallax -L$(XEN_LIBXC) -L. -lblktap -lpthread $(PLX_SRCS) parallax-threaded: $(LIB) $(PLXT_SRCS) - $(CC) $(CFLAGS) -o parallax-threaded -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -L. -lpthread -lblktap $(PLXT_SRCS) + $(CC) $(CFLAGS) -o parallax-threaded -L$(XEN_LIBXC) -L. -lpthread -lblktap $(PLXT_SRCS) vdi_list: $(LIB) vdi_list.c $(VDI_SRCS) $(CC) $(CFLAGS) -g3 -o vdi_list vdi_list.c -lpthread $(VDI_SRCS) |