svn merge ^/branches/released .

7 files changed, 306 insertions, 286 deletions

diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 461e87ca3..ab3fe7dc4 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -16,10 +16,12 @@ PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@

 API_DEFINES = @API_DEFINES@

 SHARED_GLAPI = @SHARED_GLAPI@

-CFLAGS = @CPPFLAGS@ @CFLAGS@ \

+CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \

 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)

-CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \

+CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \

 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@

+CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@

 LDFLAGS = @LDFLAGS@

 EXTRA_LIB_PATH = @EXTRA_LIB_PATH@

 RADEON_CFLAGS = @RADEON_CFLAGS@

@@ -34,6 +36,8 @@ LLVM_LIBS = @LLVM_LIBS@
 GLW_CFLAGS = @GLW_CFLAGS@

 GLUT_CFLAGS = @GLUT_CFLAGS@

 GLX_TLS = @GLX_TLS@

+DRI_CFLAGS = @DRI_CFLAGS@

+DRI_CXXFLAGS = @DRI_CXXFLAGS@

 

 # dlopen

 DLOPEN_LIBS = @DLOPEN_LIBS@

@@ -107,7 +111,10 @@ GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)

 

 # Driver specific build vars

-DRI_DIRS = @DRI_DIRS@ 

+DRI_DIRS = @DRI_DIRS@

+DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@

+DRICORE_LIBS = @DRICORE_LIBS@

+DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@

 EGL_PLATFORMS = @EGL_PLATFORMS@

 EGL_CLIENT_APIS = @EGL_CLIENT_APIS@

 

@@ -137,6 +144,7 @@ GLAPI_LIB_DEPS = $(EXTRA_LIB_PATH) @GLAPI_LIB_DEPS@
 WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIBPATH) @WAYLAND_EGL_LIB_DEPS@

 

 # DRI dependencies

+MESA_MODULES = @MESA_MODULES@

 DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@

 LIBDRM_CFLAGS = @LIBDRM_CFLAGS@

 LIBDRM_LIB = @LIBDRM_LIBS@

diff --git a/mesalib/configs/default b/mesalib/configs/default
index e58ca4143..0e9166b4f 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -89,6 +89,9 @@ VG_LIB_GLOB = $(VG_LIB_NAME)*
 GLAPI_LIB_GLOB = $(GLAPI_LIB_NAME)*

 WAYLAND_EGL_LIB_GLOB = $(WAYLAND_EGL_LIB_NAME)*

 

+DRI_CFLAGS = $(CFLAGS)

+DRI_CXXFLAGS = $(CXXFLAGS)

+

 # Optional assembly language optimization files for libGL

 MESA_ASM_SOURCES = 

 

diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri
index a4aa82e96..3330ff1aa 100644
--- a/mesalib/configs/freebsd-dri
+++ b/mesalib/configs/freebsd-dri
@@ -1,51 +1,53 @@
-# -*-makefile-*-
-# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
-
-include $(TOP)/configs/freebsd
-
-CONFIG_NAME = freebsd-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
-
-EXPAT_INCLUDES = -I/usr/local/include
-X11_INCLUDES = -I/usr/local/include
-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
-	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-ASM_SOURCES = 
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-	-lm -pthread $(LIBDRM_LIB)
-
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
-
-
-# Directories
-SRC_DIRS = glx gallium mesa glu glut/glx glw
-DRIVER_DIRS = dri
-
-DRM_SOURCE_PATH=$(TOP)/../drm
-
-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
-	   unichrome savage sis
-
+# -*-makefile-*-

+# Configuration for freebsd-dri: FreeBSD DRI hardware drivers

+

+include $(TOP)/configs/freebsd

+

+CONFIG_NAME = freebsd-dri

+

+# Compiler and flags

+CC = gcc

+CXX = g++

+WARN_FLAGS = -Wall

+OPT_FLAGS = -O -g

+

+EXPAT_INCLUDES = -I/usr/local/include

+X11_INCLUDES = -I/usr/local/include

+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

+	-DHAVE_ALIAS

+

+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \

+	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)

+

+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 

+

+# Work around aliasing bugs - developers should comment this out

+CFLAGS += -fno-strict-aliasing

+CXXFLAGS += -fno-strict-aliasing

+

+ASM_SOURCES = 

+MESA_ASM_SOURCES = 

+

+# Library/program dependencies

+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

+

+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`

+LIBDRM_LIB = `pkg-config --libs libdrm`

+DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)

+GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

+	-lm -pthread $(LIBDRM_LIB)

+

+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm

+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11

+

+

+# Directories

+SRC_DIRS = glx gallium mesa glu glut/glx glw

+DRIVER_DIRS = dri

+

+DRM_SOURCE_PATH=$(TOP)/../drm

+

+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \

+	   unichrome savage sis

+

diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index 1c94ed0b1..9279829a4 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -1,71 +1,73 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-#MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-OPT_FLAGS  = -O2 -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-GLUT_CFLAGS = -fexceptions
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
-LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-		-lm -lpthread -ldl $(LIBDRM_LIB)
-
-
-# Directories
-SRC_DIRS := glx egl $(SRC_DIRS)
-
-# EGL directories
-EGL_DRIVERS_DIRS = glx
-
-DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
-GALLIUM_TARGET_DIRS = 
-GALLIUM_STATE_TRACKERS_DIRS = egl
-
-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome swrast
-
-INTEL_LIBS = `pkg-config --libs libdrm_intel`
-INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
-
-RADEON_LIBS = `pkg-config --libs libdrm_radeon`
-RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`
+# -*-makefile-*-

+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others

+

+include $(TOP)/configs/default

+

+CONFIG_NAME = linux-dri

+

+# Compiler and flags

+CC = gcc

+CXX = g++

+

+#MKDEP = /usr/X11R6/bin/makedepend

+#MKDEP = gcc -M

+#MKDEP_OPTIONS = -MF depend

+

+OPT_FLAGS  = -O2 -g

+PIC_FLAGS  = -fPIC

+

+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.

+ARCH_FLAGS ?=

+

+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \

+	-D_BSD_SOURCE -D_GNU_SOURCE \

+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

+

+X11_INCLUDES = -I/usr/X11R6/include

+

+CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \

+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)

+

+CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+

+GLUT_CFLAGS = -fexceptions

+

+# Work around aliasing bugs - developers should comment this out

+CFLAGS += -fno-strict-aliasing

+CXXFLAGS += -fno-strict-aliasing

+

+MESA_ASM_SOURCES = 

+

+# Library/program dependencies

+EXTRA_LIB_PATH=-L/usr/X11R6/lib

+

+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

+

+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)

+LIBDRM_LIB = $(shell pkg-config --libs libdrm)

+DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)

+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

+		-lm -lpthread -ldl $(LIBDRM_LIB)

+

+

+# Directories

+SRC_DIRS := glx egl $(SRC_DIRS)

+

+# EGL directories

+EGL_DRIVERS_DIRS = glx

+

+DRIVER_DIRS = dri

+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965

+GALLIUM_TARGET_DIRS = 

+GALLIUM_STATE_TRACKERS_DIRS = egl

+

+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \

+	savage sis tdfx unichrome swrast

+

+INTEL_LIBS = `pkg-config --libs libdrm_intel`

+INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`

+

+RADEON_LIBS = `pkg-config --libs libdrm_radeon`

+RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`

diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb
index 8092a048d..292788990 100644
--- a/mesalib/configs/linux-dri-xcb
+++ b/mesalib/configs/linux-dri-xcb
@@ -1,54 +1,56 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri-xcb
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-#MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-OPT_FLAGS  = -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-        -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx)
-
-CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
-	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11)
-
-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
-LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
-                $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)
-
-SRC_DIRS = glx gallium mesa glu glut/glx glw
-
-DRIVER_DIRS = dri
-DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome
+# -*-makefile-*-

+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others

+

+include $(TOP)/configs/default

+

+CONFIG_NAME = linux-dri-xcb

+

+# Compiler and flags

+CC = gcc

+CXX = g++

+

+#MKDEP = /usr/X11R6/bin/makedepend

+#MKDEP = gcc -M

+#MKDEP_OPTIONS = -MF depend

+

+OPT_FLAGS  = -g

+PIC_FLAGS  = -fPIC

+

+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.

+ARCH_FLAGS ?=

+

+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \

+	-D_BSD_SOURCE -D_GNU_SOURCE \

+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

+        -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN

+

+X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx)

+

+CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \

+	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 

+

+CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+

+# Work around aliasing bugs - developers should comment this out

+CFLAGS += -fno-strict-aliasing

+CXXFLAGS += -fno-strict-aliasing

+

+MESA_ASM_SOURCES = 

+

+# Library/program dependencies

+EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11)

+

+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

+

+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)

+LIBDRM_LIB = $(shell pkg-config --libs libdrm)

+DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)

+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \

+                $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)

+

+SRC_DIRS = glx gallium mesa glu glut/glx glw

+

+DRIVER_DIRS = dri

+DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \

+	savage sis tdfx unichrome

diff --git a/mesalib/configs/linux-egl b/mesalib/configs/linux-egl
index 6393e942c..7e928a690 100644
--- a/mesalib/configs/linux-egl
+++ b/mesalib/configs/linux-egl
@@ -1,56 +1,58 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-#MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-OPT_FLAGS  = -O -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
-LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-		-lm -lpthread -ldl \
-                $(LIBDRM_LIB)
-
-
-# Directories
-SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
-
-DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = egl_drm
-GALLIUM_TARGET_DIRS =
-
-DRI_DIRS = intel 
+# -*-makefile-*-

+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others

+

+include $(TOP)/configs/default

+

+CONFIG_NAME = linux-dri

+

+# Compiler and flags

+CC = gcc

+CXX = g++

+

+#MKDEP = /usr/X11R6/bin/makedepend

+#MKDEP = gcc -M

+#MKDEP_OPTIONS = -MF depend

+

+OPT_FLAGS  = -O -g

+PIC_FLAGS  = -fPIC

+

+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.

+ARCH_FLAGS ?=

+

+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \

+	-D_BSD_SOURCE -D_GNU_SOURCE \

+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

+

+X11_INCLUDES = -I/usr/X11R6/include

+

+CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \

+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)

+

+CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+

+

+MESA_ASM_SOURCES = 

+

+# Library/program dependencies

+EXTRA_LIB_PATH=-L/usr/X11R6/lib

+

+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

+

+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)

+LIBDRM_LIB = $(shell pkg-config --libs libdrm)

+DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)

+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

+		-lm -lpthread -ldl \

+                $(LIBDRM_LIB)

+

+

+# Directories

+SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl

+

+DRIVER_DIRS = dri

+GALLIUM_WINSYS_DIRS = egl_drm

+GALLIUM_TARGET_DIRS =

+

+DRI_DIRS = intel 

diff --git a/mesalib/configs/linux-indirect b/mesalib/configs/linux-indirect
index 272d34e84..8a31bcd87 100644
--- a/mesalib/configs/linux-indirect
+++ b/mesalib/configs/linux-indirect
@@ -1,51 +1,52 @@
-# -*-makefile-*-
-# Configuration for linux-indirect: Builds a libGL capable of indirect
-# rendering, but *NOT* capable of direct rendering.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-#MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-WARN_FLAGS = -Wall
-OPT_FLAGS  = -O -g
-PIC_FLAGS  = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DGLX_INDIRECT_RENDERING \
-	-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-	$(ASM_FLAGS) -std=c99 -ffast-math 
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES = 
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-
-
-# Directories
-SRC_DIRS = glx glu glut/glx glw
-DRIVER_DIRS =
+# -*-makefile-*-

+# Configuration for linux-indirect: Builds a libGL capable of indirect

+# rendering, but *NOT* capable of direct rendering.

+

+include $(TOP)/configs/default

+

+CONFIG_NAME = linux-dri

+

+# Compiler and flags

+CC = gcc

+CXX = g++

+

+#MKDEP = /usr/X11R6/bin/makedepend

+#MKDEP = gcc -M

+#MKDEP_OPTIONS = -MF depend

+

+WARN_FLAGS = -Wall

+OPT_FLAGS  = -O -g

+PIC_FLAGS  = -fPIC

+

+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.

+ARCH_FLAGS ?=

+

+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \

+	-D_BSD_SOURCE -D_GNU_SOURCE \

+	-DGLX_INDIRECT_RENDERING \

+	-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

+

+X11_INCLUDES = -I/usr/X11R6/include

+

+CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \

+	$(ASM_FLAGS) -std=c99 -ffast-math 

+

+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

+

+# Work around aliasing bugs - developers should comment this out

+CFLAGS += -fno-strict-aliasing

+CXXFLAGS += -fno-strict-aliasing

+

+MESA_ASM_SOURCES = 

+

+# Library/program dependencies

+EXTRA_LIB_PATH=-L/usr/X11R6/lib

+

+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

+DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl

+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl

+

+

+# Directories

+SRC_DIRS = glx glu glut/glx glw

+DRIVER_DIRS =