Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

2 files changed, 3 insertions, 112 deletions

diff --git a/mesalib/src/mesa/drivers/dri/Makefile.template b/mesalib/src/mesa/drivers/dri/Makefile.template
deleted file mode 100644
index 195d60a9c..000000000
--- a/mesalib/src/mesa/drivers/dri/Makefile.template
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*-makefile-*-

-

-COMMON_GALLIUM_SOURCES = \

-        ../common/utils.c \

-        ../common/vblank.c \

-        ../common/dri_util.c \

-        ../common/xmlconfig.c

-

-COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \

-        ../../common/driverfuncs.c \

-        ../common/texmem.c \

-        ../common/drirenderbuffer.c

-

-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)

-

-OBJECTS = $(C_SOURCES:.c=.o) \

-	  $(CXX_SOURCES:.cpp=.o) \

-	  $(ASM_SOURCES:.S=.o) 

-

-

-### Include directories

-SHARED_INCLUDES = \

-	-I. \

-	-I$(TOP)/src/mesa/drivers/dri/common \

-	-Iserver \

-	-I$(TOP)/include \

-	-I$(TOP)/src/mapi \

-	-I$(TOP)/src/mesa \

-	-I$(TOP)/src/egl/main \

-	-I$(TOP)/src/egl/drivers/dri \

-	$(LIBDRM_CFLAGS)

-

-CFLAGS += $(API_DEFINES)

-CXXFLAGS += $(API_DEFINES)

-

-##### RULES #####

-

-.c.o:

-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@

-

-.cpp.o:

-	$(CC) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DRIVER_DEFINES) $< -o $@

-

-.S.o:

-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DRIVER_DEFINES) $< -o $@

-

-

-##### TARGETS #####

-

-default: subdirs lib

-

-

-.PHONY: lib

-lib: symlinks subdirs depend

-	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)

-

-$(LIBNAME): $(OBJECTS) $(EXTRA_MODULES) $(MESA_MODULES) Makefile \

-		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o

-	$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

-		$(OBJECTS) $(EXTRA_MODULES) $(DRI_LIB_DEPS)

-	$(CXX) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)

-	@rm -f $@.test

-	mv -f $@.tmp $@

-

-

-$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)

-	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 

-

-

-# If the Makefile defined SUBDIRS, run make in each

-.PHONY: subdirs

-subdirs:

-	@if test -n "$(SUBDIRS)" ; then \

-		for dir in $(SUBDIRS) ; do \

-			if [ -d $$dir ] ; then \

-				(cd $$dir && $(MAKE)) || exit 1; \

-			fi \

-		done \

-	fi

-

-

-.PHONY: symlinks

-symlinks:

-

-

-depend: $(C_SOURCES) $(CXX_SOURCES) $(ASM_SOURCES) $(SYMLINKS)

-	@ echo "running $(MKDEP)"

-	@ rm -f depend

-	@ touch depend

-	@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) \

-		$(C_SOURCES) $(CXX_SOURCES) \

-		$(ASM_SOURCES) > /dev/null 2>/dev/null

-

-

-# Emacs tags

-tags:

-	etags `find . -name \*.[ch]` `find ../include`

-

-

-# Remove .o and backup files

-clean:

-	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)

-	-rm -f depend depend.bak

-

-

-install: $(LIBNAME)

-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-

-

--include depend

diff --git a/mesalib/src/mesa/drivers/dri/swrast/Makefile b/mesalib/src/mesa/drivers/dri/swrast/Makefile
index d2cf6dbc5..4cb99fd0e 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/Makefile
+++ b/mesalib/src/mesa/drivers/dri/swrast/Makefile
@@ -5,6 +5,8 @@ include $(TOP)/configs/current
 
 LIBNAME = swrast_dri.so
 
+include ../Makefile.defines
+
 DRIVER_DEFINES = -D__NOT_HAVE_DRM_H
 
 DRIVER_SOURCES = \
@@ -22,5 +24,5 @@ SWRAST_COMMON_SOURCES = \
 	../common/utils.c \
 	../common/drisw_util.c
 
-include ../Makefile.template
+include ../Makefile.targets