1124N/Adiff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am

1124N/Aindex bf81436..e27bbc3 100644

1124N/A--- a/hw/xfree86/dixmods/Makefile.am

1124N/A+++ b/hw/xfree86/dixmods/Makefile.am

705N/A@@ -36,6 +36,7 @@ libdbe_la_SOURCES = dbemodule.c

606N/A

606N/A libfb_la_LDFLAGS = -avoid-version

705N/A libfb_la_LIBADD = $(top_builddir)/fb/libfb.la

705N/A+libfb_la_LIBADD += -lpixman-1

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

606N/A libfb_la_CFLAGS = $(AM_CFLAGS)

606N/A

1124N/A@@ -47,6 +48,8 @@ libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER

705N/A libglx_la_LDFLAGS = -avoid-version -mimpure-text

705N/A if AIGLX

705N/A GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la

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

705N/A+libglx_la_LDFLAGS += -Wl,-N,libdri.so -Wl,-N,libdri2.so

705N/A endif

705N/A libglx_la_LIBADD = \

705N/A $(top_builddir)/glx/libglx.la \

1124N/Adiff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am

1124N/Aindex f5ece69..ee87284 100644

1124N/A--- a/hw/xfree86/int10/Makefile.am

1124N/A+++ b/hw/xfree86/int10/Makefile.am

1124N/A@@ -44,3 +44,5 @@ libint10_la_SOURCES = stub.c xf86int10module.c

606N/A endif

606N/A

606N/A EXTRA_DIST = xf86x86emu.h INT10.HOWTO

606N/A+

606N/A+libint10_la_LIBADD = $(PCIACCESS_LIBS)

1124N/Adiff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am

1124N/Aindex 02d2dd4..8c7abb3 100644

1124N/A--- a/hw/xfree86/shadowfb/Makefile.am

1124N/A+++ b/hw/xfree86/shadowfb/Makefile.am

1088N/A@@ -7,3 +7,5 @@ sdk_HEADERS = shadowfb.h

957N/A INCLUDES = $(XORG_INCS)

957N/A

957N/A AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

957N/A+

957N/A+libshadowfb_la_LIBADD = -lXfont

1124N/Adiff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am

1124N/Aindex 85c6fd8..be8359e 100644

1124N/A--- a/hw/xfree86/vbe/Makefile.am

1124N/A+++ b/hw/xfree86/vbe/Makefile.am

1088N/A@@ -8,3 +8,5 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

957N/A

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

957N/A -I$(srcdir)/../int10

957N/A+

957N/A+libvbe_la_LIBADD = ../int10/libint10.la