[Xen-devel] [PATCH] Fix multiple inclusion when building libxenguest.

[John Levon <levon@xxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User john.levon@xxxxxxx
# Date 1161091454 25200
# Node ID 3c79fe20116bccea65a7d455590bea6331d27d6f
# Parent  1911935b49d16e774f51d4104edb0164b770e0d7
Fix multiple inclusion when building libxenguest.

The build gives this warning on Solaris:

ld: warning: file ./libxenctrl.so: linked to libxenctrl.so: attempted multiple 
inclusion of file

Fix the makefiles to not include this library twice on the link line.

Signed-off-by: John Levon <john.levon@xxxxxxx>

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -137,7 +137,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.
        ln -sf $< $@
 
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-       $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) 
$(SHLIB_FLAGS) -o $@ $^ -lz -lxenctrl
+       $(CC) $(CFLAGS) $(LDFLAGS) $(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) 
$(SHLIB_FLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl
 
 -include $(DEPS)
 

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