xserver: Branch 'master'

[Dave Airlie]

 hw/xfree86/Makefile.am        |    2 +-
 hw/xfree86/parser/Makefile.am |   14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 5fb188b547e0ef4e2f2c59b66a3183b004e4a1e9
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Aug 7 12:05:51 2009 +1000

    ddx: fix xf86Config.a generation
    
    We were generating a shared library, but this lib is foobar, the parser
    requires some symbols from the X server or from the program its being linked
    into. If the program its being linked into (say a python .so) has symbol
    visibility enabled then it will fail to dynamic link, also if this .so has
    symbol visiblity enabled it will fail to dynamic link.
    
    Screw it go back to a .a file really unless someone cleans it up properly.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 898c9b8..b97ebd7 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -53,7 +53,7 @@ libxorg_la_LIBADD = \
             loader/libloader.la \
             os-support/libxorgos.la \
             common/libcommon.la \
-            parser/libxf86config.la \
+            parser/libxf86config_internal.la \
             dixmods/libdixmods.la \
             modes/libxf86modes.la \
             ramdac/libramdac.la \
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index c062209..6153747 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,13 +1,14 @@
 if INSTALL_LIBXF86CONFIG
-lib_LTLIBRARIES = libxf86config.la
+lib_LTLIBRARIES = libxf86config_internal.la
+lib_LIBRARIES = libxf86config.a
 LIBHEADERS = \
 	xf86Optrec.h \
 	xf86Parser.h
 else
-noinst_LTLIBRARIES = libxf86config.la
+noinst_LTLIBRARIES = libxf86config_internal.la
 endif
 
-libxf86config_la_SOURCES = \
+INTERNAL_SOURCES= \
 	Device.c \
 	Files.c \
 	Flags.c \
@@ -25,6 +26,13 @@ libxf86config_la_SOURCES = \
 	DRI.c \
 	Extensions.c
 
+libxf86config_internal_la_SOURCES = \
+	$(INTERNAL_SOURCES)
+
+libxf86config_a_SOURCES = \
+	$(INTERNAL_SOURCES)
+libxf86config_a_CFLAGS = $(AM_CFLAGS)
+
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 
 EXTRA_DIST = \