From: John Levon Subject: [PATCH] Fix multiple inclusion when building libxenguest. Date: Tue, 17 Oct 2006 14:25:13 +0100 Message-ID: <20061017132513.GC7013@totally.trollied.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org # HG changeset patch # User john.levon@sun.com # 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 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)