xserver: Branch 'master'

[Dave Airlie]

 hw/xfree86/parser/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e94c7c42ce9d6a194b76ba7e8b3904b180f93a1b
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Aug 7 13:36:52 2009 +1000

    parser: make libxf86config_internal.la not installed.

diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 6153747..b8fab28 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,5 +1,5 @@
 if INSTALL_LIBXF86CONFIG
-lib_LTLIBRARIES = libxf86config_internal.la
+noinst_LTLIBRARIES = libxf86config_internal.la
 lib_LIBRARIES = libxf86config.a
 LIBHEADERS = \
 	xf86Optrec.h \