[Xen-changelog] merge?

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 7a36f58f64ee2f53f07aff83fa4bb787859badd4
# Parent  77d8b5e40da7f3dac219d3f47b4dc0cb4cea9c7c
# Parent  99f12399b25a969989af0543da0330601f562f65
merge?

diff -r 77d8b5e40da7 -r 7a36f58f64ee tools/libxc/Makefile
--- a/tools/libxc/Makefile      Wed Sep  7 09:42:47 2005
+++ b/tools/libxc/Makefile      Wed Sep  7 09:50:57 2005
@@ -139,7 +139,7 @@
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
        ln -sf $< $@
 
-libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS)
+libxenguest.so.$(MAJOR).$(MINOR): $(PIC_BUILD_OBJS) libxenctrl.so
        $(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenguest.so.$(MAJOR) 
-shared -o $@ $^ -lz -lxenctrl
 
 -include $(DEPS)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog