diff -Nurp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am

--- hw/xfree86/dixmods/Makefile.am 2010-09-03 16:45:29.752570908 -0700

+++ hw/xfree86/dixmods/Makefile.am 2010-09-03 16:45:32.323005868 -0700

@@ -36,6 +36,7 @@ libdbe_la_SOURCES = dbemodule.c

libfb_la_LDFLAGS = -avoid-version

libfb_la_LIBADD = $(top_builddir)/fb/libfb.la

+libfb_la_LIBADD += -lpixman-1

libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c

libfb_la_CFLAGS = $(AM_CFLAGS)

@@ -47,6 +48,8 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACC

libglx_la_LDFLAGS = -avoid-version -mimpure-text

if AIGLX

GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la

+libglx_la_LDFLAGS += -R$(extsmoduledir:amd64/extensions=extensions/amd64)

+libglx_la_LDFLAGS += -Wl,-N,libdri.so -Wl,-N,libdri2.so

endif

libglx_la_LIBADD = \

$(top_builddir)/glx/libglx.la \

diff -Nurp -x '*~' -x '*.orig' hw/xfree86/int10/Makefile.am hw/xfree86/int10/Makefile.am

--- hw/xfree86/int10/Makefile.am 2010-07-14 13:23:17.000000000 -0700

+++ hw/xfree86/int10/Makefile.am 2010-09-03 16:45:32.323355539 -0700

@@ -44,3 +44,5 @@ libint10_la_SOURCES = stub.c xf86int10mo

endif

EXTRA_DIST = xf86x86emu.h INT10.HOWTO

+

+libint10_la_LIBADD = $(PCIACCESS_LIBS)

diff -Nurp -x '*~' -x '*.orig' hw/xfree86/shadowfb/Makefile.am hw/xfree86/shadowfb/Makefile.am

--- hw/xfree86/shadowfb/Makefile.am 2010-06-05 18:16:52.000000000 -0700

+++ hw/xfree86/shadowfb/Makefile.am 2010-09-03 16:45:32.323606069 -0700

@@ -7,3 +7,5 @@ sdk_HEADERS = shadowfb.h

INCLUDES = $(XORG_INCS)

AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

+

+libshadowfb_la_LIBADD = -lXfont

diff -Nurp -x '*~' -x '*.orig' hw/xfree86/vbe/Makefile.am hw/xfree86/vbe/Makefile.am

--- hw/xfree86/vbe/Makefile.am 2010-06-05 18:16:52.000000000 -0700

+++ hw/xfree86/vbe/Makefile.am 2010-09-03 16:45:32.323810540 -0700

@@ -8,3 +8,5 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \

-I$(srcdir)/../int10

+

+libvbe_la_LIBADD = ../int10/libint10.la