606N/Adiff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am

606N/A--- src/Makefile.am 2008-08-25 18:25:53.000000000 -0700

606N/A+++ src/Makefile.am 2009-01-10 20:01:41.033942000 -0800

606N/A@@ -34,7 +34,9 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@

606N/A @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA

199N/A

199N/A intel_drv_la_LTLIBRARIES = intel_drv.la

199N/A-intel_drv_la_LDFLAGS = -module -avoid-version

199N/A+intel_drv_la_LDFLAGS = -module -avoid-version \

606N/A+ -ldrm -lfb -lint10 -lpciaccess -lshadow -lshadowfb \

199N/A+ -lvbe -lvgahw -lxaa -lexa -ldri -lglx -lm

199N/A intel_drv_ladir = @moduledir@/drivers

606N/A intel_drv_la_LIBADD =

606N/A if XSERVER_LIBPCIACCESS

606N/Adiff -urp -x '*~' -x '*.orig' src/ch7017/Makefile.am src/ch7017/Makefile.am

606N/A--- src/ch7017/Makefile.am 2008-07-22 23:14:09.000000000 -0700

606N/A+++ src/ch7017/Makefile.am 2009-01-10 20:01:41.042690000 -0800

606N/A@@ -7,7 +7,9 @@ AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS

606N/A @PCIACCESS_CFLAGS@

199N/A

199N/A ch7017_la_LTLIBRARIES = ch7017.la

199N/A-ch7017_la_LDFLAGS = -module -avoid-version

199N/A+ch7017_la_LDFLAGS = -module -avoid-version \

199N/A+ -ldrm -lfb -lint10 -lshadow -lshadowfb \

199N/A+ -lvbe -lvgahw -lxaa -ldri -lglx -lm

199N/A ch7017_ladir = @moduledir@/drivers

199N/A

199N/A ch7017_la_SOURCES = \

606N/Adiff -urp -x '*~' -x '*.orig' src/xvmc/Makefile.am src/xvmc/Makefile.am

606N/A--- src/xvmc/Makefile.am 2008-08-25 18:25:53.000000000 -0700

606N/A+++ src/xvmc/Makefile.am 2009-01-10 20:01:41.036760000 -0800

606N/A@@ -6,7 +6,8 @@ libI810XvMC_la_SOURCES = I810XvMC.c \

606N/A

606N/A libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \

606N/A -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0

606N/A-libI810XvMC_la_LDFLAGS = -version-number 1:0:0

606N/A+libI810XvMC_la_LDFLAGS = -version-number 1:0:0 \

606N/A+ -lXvMC -lXv -lX11 -ldrm

606N/A libI810XvMC_la_LIBADD = @DRI_LIBS@

606N/A

606N/A libIntelXvMC_la_SOURCES = intel_xvmc.c \