From 4f2e731aba0c5694abb65a877395cc5f9869c556 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 17 Jul 2005 07:34:31 +0000
Subject: [PATCH] objdir != srcdir fixes.

---
 configure.ac                          |  1 -
 hw/xfree86/dixmods/Makefile.am        | 28 +++++++++++++--------------
 hw/xfree86/dixmods/extmod/Makefile.am |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index b29c9c3a8..b5f449023 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,7 +705,6 @@ AC_DEFINE(XFree86XDGA,1,[Build XDGA support])
 AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension])
 AC_DEFINE(XResExtension,1,[Build XRes extension])
 AC_DEFINE(DPMSExtension,1,[Build DPMS extension])
-
 dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
 dnl _*_SOURCE on Solaris restricts to the standards, and removes non-standard
 dnl functions which X uses
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 9f29ab897..bf7463acd 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -31,11 +31,11 @@ INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/miext/shadow
 
 libGLcore_la_LDFLAGS = -avoid-version
-libGLcore_la_LIBADD = $(top_srcdir)/GL/mesa/libGLcore.la
+libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
 libGLcore_la_SOURCES = GLcoremodule.c
 
 libafb_la_LDFLAGS = -avoid-version
-libafb_la_LIBADD = $(top_srcdir)/afb/libafb.la
+libafb_la_LIBADD = $(top_builddir)/afb/libafb.la
 libafb_la_SOURCES = afbmodule.c
 
 # libbitmap is just a wrapper around the bitmap font code in Xfont.
@@ -44,48 +44,48 @@ libbitmap_la_SOURCES = bitmapmod.c
 libbitmap_la_LDFLAGS = -avoid-version # `pkg-config --libs xfont`
 
 libcfb_la_LDFLAGS = -avoid-version
-libcfb_la_LIBADD = $(top_srcdir)/cfb/libcfb.la
+libcfb_la_LIBADD = $(top_builddir)/cfb/libcfb.la
 libcfb_la_SOURCES = cfbmodule.c
 
 libcfb16_la_LDFLAGS = -avoid-version
-libcfb16_la_LIBADD = $(top_srcdir)/cfb16/libcfb16.la
+libcfb16_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la
 libcfb16_la_SOURCES = cfb16module.c
 
 libcfb24_la_LDFLAGS = -avoid-version
-libcfb24_la_LIBADD = $(top_srcdir)/cfb24/libcfb24.la
+libcfb24_la_LIBADD = $(top_builddir)/cfb24/libcfb24.la
 libcfb24_la_SOURCES = cfb24module.c
 
 libcfb32_la_LDFLAGS = -avoid-version
-libcfb32_la_LIBADD = $(top_srcdir)/cfb32/libcfb32.la
+libcfb32_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
 libcfb32_la_SOURCES = cfb32module.c
 
 libdbe_la_LDFLAGS = -avoid-version
-libdbe_la_LIBADD = $(top_srcdir)/dbe/libdbe.la
+libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
 libdbe_la_SOURCES = dbemodule.c
 
 libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
 libfb_la_LDFLAGS = -avoid-version
-libfb_la_LIBADD = $(top_srcdir)/fb/libfb.la
-libfb_la_SOURCES = $(top_srcdir)/fb/fbcmap.c fbmodule.c
+libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
+libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
 
 libglx_la_LDFLAGS = -avoid-version
-libglx_la_LIBADD = $(top_srcdir)/GL/glx/libglx.la
+libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la
 libglx_la_SOURCES = glxmodule.c
 
 liblayer_la_LDFLAGS = -avoid-version
-liblayer_la_LIBADD = $(top_srcdir)/miext/layer/liblayer.la
+liblayer_la_LIBADD = $(top_builddir)/miext/layer/liblayer.la
 liblayer_la_SOURCES = laymodule.c
 
 libmfb_la_LDFLAGS = -avoid-version
-libmfb_la_LIBADD = $(top_srcdir)/mfb/libmfb.la
+libmfb_la_LIBADD = $(top_builddir)/mfb/libmfb.la
 libmfb_la_SOURCES = mfbmodule.c
 
 librecord_la_LDFLAGS = -avoid-version
-librecord_la_LIBADD = $(top_srcdir)/record/librecord.la
+librecord_la_LIBADD = $(top_builddir)/record/librecord.la
 librecord_la_SOURCES = recordmod.c
 
 libshadow_la_LDFLAGS = -avoid-version
-libshadow_la_LIBADD = $(top_srcdir)/miext/shadow/libshadow.la
+libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
 libshadow_la_SOURCES = shmodule.c
 
 libdixmods_la_SOURCES = xkbKillSrv.c \
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index aec4cabf2..50c5bb771 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/miext/shadow
 
 libextmod_la_LDFLAGS = -avoid-version
-libextmod_la_LIBADD = $(top_srcdir)/Xext/libXext.la
+libextmod_la_LIBADD = $(top_builddir)/Xext/libXext.la
 libextmod_la_SOURCES = modinit.c \
                        $(DGA_SRCS) \
                        xf86misc.c \