Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig xserver mesa git update 29 nov 2012

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/os/osinit.c
	xorg-server/os/utils.c

1 files changed, 1 insertions, 51 deletions

diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am
index b22458ec8..1f4fcac3a 100644
--- a/mesalib/Makefile.am
+++ b/mesalib/Makefile.am
@@ -85,57 +85,7 @@ EXTRA_FILES = \
 	src/mesa/program/lex.yy.c			\
 	src/mesa/program/program_parse.tab.c		\
 	src/mesa/program/program_parse.tab.h		\
-	src/gallium/drivers/r600/Makefile.in		\
-	src/gallium/drivers/r300/Makefile.in		\
-	src/gallium/drivers/Makefile.in			\
-	src/gallium/Makefile.in				\
-	src/gallium/auxiliary/pipe-loader/Makefile.in	\
-	src/gallium/targets/opencl/Makefile.in		\
-	src/gallium/state_trackers/clover/Makefile.in	\
-	src/mapi/glapi/tests/Makefile.in		\
-	src/mapi/glapi/Makefile.in			\
-	src/mapi/glapi/gen/Makefile.in			\
-	src/mapi/es1api/Makefile.in			\
-	src/mapi/shared-glapi/tests/Makefile.in		\
-	src/mapi/shared-glapi/Makefile.in		\
-	src/mapi/vgapi/Makefile.in			\
-	src/mapi/es2api/Makefile.in			\
-	src/glsl/tests/Makefile.in			\
-	src/glsl/glcpp/Makefile.in			\
-	src/glsl/builtin_compiler/Makefile.in		\
-	src/glsl/Makefile.in				\
-	src/gtest/Makefile.in				\
-	src/egl/drivers/Makefile.in			\
-	src/egl/drivers/glx/Makefile.in			\
-	src/egl/drivers/dri2/Makefile.in		\
-	src/egl/Makefile.in				\
-	src/egl/main/Makefile.in			\
-	src/egl/wayland/Makefile.in			\
-	src/egl/wayland/wayland-drm/Makefile.in		\
-	src/egl/wayland/wayland-egl/Makefile.in		\
-	src/Makefile.in					\
-	src/glx/tests/Makefile.in			\
-	src/glx/Makefile.in				\
-	src/gbm/Makefile.in				\
-	src/mesa/drivers/Makefile.in			\
-	src/mesa/drivers/dri/common/Makefile.in		\
-	src/mesa/drivers/dri/i965/Makefile.in		\
-	src/mesa/drivers/dri/r200/Makefile.in		\
-	src/mesa/drivers/dri/Makefile.in		\
-	src/mesa/drivers/dri/radeon/Makefile.in		\
-	src/mesa/drivers/dri/swrast/Makefile.in		\
-	src/mesa/drivers/dri/nouveau/Makefile.in	\
-	src/mesa/drivers/dri/i915/Makefile.in		\
-	src/mesa/drivers/osmesa/Makefile.in		\
-	src/mesa/drivers/x11/Makefile.in		\
-	src/mesa/Makefile.in				\
-	src/mesa/libdricore/Makefile.in			\
-	src/mesa/x86-64/Makefile.in			\
-	src/mesa/program/Makefile.in			\
-	src/mesa/main/tests/Makefile.in			\
-	src/mesa/main/tests/hash_table/Makefile.in	\
-	src/mesa/x86/Makefile.in			\
-	Makefile.in
+	`git ls-files | grep "Makefile.am" | sed -e "s/Makefile.am/Makefile.in/"`
 
 
 IGNORE_FILES = \