Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

1 files changed, 23 insertions, 24 deletions

diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am
index 6fa1dd29f..c3e006c1f 100644
--- a/xorg-server/hw/xfree86/Makefile.am
+++ b/xorg-server/hw/xfree86/Makefile.am
@@ -38,18 +38,18 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
 	       utils doc man

 

 bin_PROGRAMS = Xorg

-Xorg_SOURCES = xorg.c

+nodist_Xorg_SOURCES = sdksyms.c

 

 AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@

-INCLUDES = @XORG_INCS@ 

+INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \

+	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac

 

-noinst_LTLIBRARIES = libxorg.la

-libxorg_la_SOURCES = libxorg.c

-libxorg_la_LIBADD = \

+LOCAL_LIBS = \

+            $(MAIN_LIB) \

             $(XSERVER_LIBS) \

             loader/libloader.la \

-            os-support/libxorgos.la \

             common/libcommon.la \

+            os-support/libxorgos.la \

             parser/libxf86config_internal.la \

             dixmods/libdixmods.la \

             modes/libxf86modes.la \

@@ -57,31 +57,21 @@ libxorg_la_LIBADD = \
             ddc/libddc.la \

             i2c/libi2c.la \

             dixmods/libxorgxkb.la \

+            $(XORG_LIBS) \

             $(top_builddir)/mi/libmi.la \

-            $(top_builddir)/os/libos.la \

-            @XORG_LIBS@

-

-libxorg_la_DEPENDENCIES = $(libxorg_la_LIBADD)

-

-libxorg.c xorg.c:

-	touch $@

-

-DISTCLEANFILES = libxorg.c xorg.c

-

-Xorg_DEPENDENCIES = libxorg.la

-Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)

+            $(top_builddir)/os/libos.la

+Xorg_LDADD = \

+            $(LOCAL_LIBS) \

+            $(XORG_SYS_LIBS) \

+            $(XSERVER_SYS_LIBS)

+Xorg_DEPENDENCIES = $(LOCAL_LIBS)

 

 Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

 

 BUILT_SOURCES = xorg.conf.example

-DISTCLEANFILES += xorg.conf.example

+DISTCLEANFILES = xorg.conf.example

 EXTRA_DIST = xorgconf.cpp

 

-if SPECIAL_DTRACE_OBJECTS

-# Re-add dtrace object code that gets lost when building static libraries

-Xorg_LDADD += $(XSERVER_LIBS)

-endif

-

 if SOLARIS_ASM_INLINE

 # Needs to be built before any files are compiled when using Sun compilers

 # so in*/out* inline definitions are properly processed.

@@ -116,3 +106,12 @@ xorg.conf.example: xorgconf.cpp
 

 relink:

 	$(AM_V_at)rm -f Xorg && $(MAKE) Xorg

+

+CLEANFILES = sdksyms.c sdksyms.dep

+EXTRA_DIST += sdksyms.sh

+

+sdksyms.dep sdksyms.c: sdksyms.sh

+	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES)

+

+SDKSYMS_DEP = sdksyms.dep

+include $(SDKSYMS_DEP)