xserver: Branch 'master' - 2 commits

[Eric Anholt]

 hw/kdrive/neomagic/Makefile.am |    2 --
 hw/xfree86/Makefile.am         |   20 +++++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

New commits:
diff-tree 529acb175440969af9d7fa38aab8d7dea0dc2661 (from c56930e6ca90a61d2f4cbd845f7d0a51a66f83cb)
Author: Eric Anholt <eric at anholt.net>
Date:   Sun Sep 2 15:16:01 2007 -0700

    Fix Xorg build by listing circular dependency libraries twice.
    
    One of these I introduced by listing dix and mi in the same library list to
    simplify other servers.  The other had been hacked around using libosandcommon,
    which is now gone.

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 511e224..b9a8579 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -35,23 +35,18 @@ INCLUDES = @XORG_INCS@ 
 
 Xorg_SOURCES = 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:
+xorg.c:
 	touch $@
 
 DISTCLEANFILES = osandcommon.c xorg.c
 
 XORG_LIBS = \
-            $(XSERVER_LIBS \
+            $(XSERVER_LIBS) \
             common/libinit.a \
             loader/libloader.a \
-            libosandcommon.la \
+            os-support/libxorgos.la \
+            common/libcommon.la \
+            os-support/libxorgos.la \
 	    rac/librac.a \
             parser/libxf86config.a \
 	    dixmods/libdixmods.la \
@@ -60,7 +55,10 @@ XORG_LIBS = \
 	    ddc/libddc.a \
 	    i2c/libi2c.a \
 	    dixmods/libxorgxkb.la \
-            @XORG_LIBS@
+	    $(top_builddir)/mi/libmi.la \
+	    $(top_builddir)/os/libos.la \
+	    @XORG_LIBS@ \
+	    dixmods/libxorgxkb.la
 
 Xorg_DEPENDENCIES = $(XORG_LIBS)
 Xorg_LDADD = $(XORG_LIBS) $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
diff-tree c56930e6ca90a61d2f4cbd845f7d0a51a66f83cb (from f98dfec79dadb70fa7bba84e7335f92b3a73dc02)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 31 18:27:41 2007 -0700

    Remove backend.[ch] from neomagic to fix distcheck.

diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index 4686547..95f0e1e 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -19,8 +19,6 @@ bin_PROGRAMS = Xneomagic
 noinst_LIBRARIES = libneomagic.a
 
 libneomagic_a_SOURCES =         \
-	backend.h                   \
-	backend.c                   \
 	neomagic.c                  \
 	neomagic.h                  \
 	neo_draw.c