705N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/dixmods/Makefile.am hw/xfree86/dixmods/Makefile.am

705N/A--- hw/xfree86/dixmods/Makefile.am 2009-05-08 17:45:57.848078000 -0700

705N/A+++ hw/xfree86/dixmods/Makefile.am 2009-05-08 17:46:07.162324000 -0700

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

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

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 \

705N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/int10/Makefile.am hw/xfree86/int10/Makefile.am

606N/A--- hw/xfree86/int10/Makefile.am 2007-10-17 07:01:23.000000000 -0700

705N/A+++ hw/xfree86/int10/Makefile.am 2009-05-08 17:46:07.162854000 -0700

705N/A@@ -42,3 +42,5 @@ libint10_la_SOURCES = stub.c xf86int10mo

606N/A endif

606N/A

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

606N/A+

606N/A+libint10_la_LIBADD = $(PCIACCESS_LIBS)