xserver: Branch 'master'

[Jon TURNEY]

 hw/xwin/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8331bde0adeccefb275c4d707e7b2cb1d95b1581
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri May 15 21:36:28 2009 +0100

    Cygwin/X: link with libmain.a to provide main()
    
    Commit 987579c930bda803427a28cb82773c389f5110d6 moves main.c into
    into libmain.a to be linked with separately, and updates the various
    DDXs to link with libmain.a, except Xwin, which also needs this change.
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 504c2a6..4f95130 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -147,7 +147,7 @@ XWin_SOURCES = $(SRCS)
 INCLUDES = -I$(top_srcdir)/miext/rootless
 
 XWin_DEPENDENCIES = $(XWIN_LIBS)
-XWin_LDADD = $(XWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
+XWin_LDADD = $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
 
 .rc.o:
 	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"