xserver: Branch 'master'

[Ian Romanick]

 hw/xfree86/Makefile.am |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
diff-tree e89d16be07e45e487913509788a9e8cb1ee09bc7 (from bf5948518763b5e21eff806a0a9abc5f7757fa10)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Tue Sep 4 14:49:49 2007 -0700

    Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart.

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index b9a8579..9be0220 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -35,7 +35,14 @@ INCLUDES = @XORG_INCS@ 
 
 Xorg_SOURCES = xorg.c
 
-xorg.c:
+# libxorgos and libcommon need symbols from each other
+noinst_LTLIBRARIES = libosandcommon.la
+libosandcommon_la_SOURCES = osandcommon.c
+libosandcommon_la_LIBADD = \
+            os-support/libxorgos.la \
+            common/libcommon.la
+
+osandcommon.c xorg.c:
 	touch $@
 
 DISTCLEANFILES = osandcommon.c xorg.c
@@ -44,9 +51,7 @@ XORG_LIBS = \
             $(XSERVER_LIBS) \
             common/libinit.a \
             loader/libloader.a \
-            os-support/libxorgos.la \
-            common/libcommon.la \
-            os-support/libxorgos.la \
+            libosandcommon.la \
 	    rac/librac.a \
             parser/libxf86config.a \
 	    dixmods/libdixmods.la \