xserver: Branch 'master' - 2 commits

[Ben Byer]

 hw/darwin/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree d9bcb22d199e8444b9762a35754e04d327dd5915 (from parents)
Merge: 272d9341d0f7c3e9e0c9b9a8c0d4d8779cdcc5cf c16343ac2ca18391b21022b2edd02ad9f413d2b3
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Tue Feb 27 16:28:20 2007 -0800

    Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver

diff-tree 272d9341d0f7c3e9e0c9b9a8c0d4d8779cdcc5cf (from ab0fc8c1ad7ea2dc3389a4a4bb1c45bbded5e7ad)
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Tue Feb 27 16:27:26 2007 -0800

    fix for hw/darwin/Makefile.am to properly use XSERVER_LIBS

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 22b396e..9b4628e 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -85,7 +85,7 @@ XDarwin_LDADD = \
 		$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
 		$(top_builddir)/miext/rootless/accel/librlAccel.la \
 		@XORG_LIBS@ \
-		-lXau -lXdmcp -lXfont -lfreetype
+		$(XSERVER_LIBS)
 
 Xquartz_LDADD = \
 		$(top_builddir)/dix/dixfonts.lo \
@@ -112,7 +112,7 @@ Xquartz_LDADD = \
 		$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
 		$(top_builddir)/miext/rootless/accel/librlAccel.la \
 		@XORG_LIBS@ \
-		-lXau -lXdmcp -lXfont -lfreetype -lXplugin
+		$(XSERVER_LIBS) -lXplugin
 
 XDarwin_LDFLAGS =  \
                  -XCClinker -Objc \
@@ -175,7 +175,7 @@ XDarwinApp_LDADD = \
 		 $(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
 		 $(top_builddir)/miext/rootless/accel/librlAccel.la \
 		 @XORG_LIBS@ \
-		 -lXau -lXdmcp -lXfont -lfreetype \
+		 $(XSERVER_LIBS) \
 		 $(top_builddir)/fb/libfb.la 
 
 XDarwinApp_LDFLAGS =  \