Merge branch '7.8'

Conflicts:
	progs/egl/Makefile

progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.

diff --cc src/gallium/targets/libgl-xlib/Makefile
index 6cd00cad45896a5d69100dc3a880d39a1610124b,0000000000000000000000000000000000000000..add3a273945668713dc8e92abd02ebf8ac5a0db7
mode 100644,000000..100644
--- 1/src/gallium/targets/libgl-xlib/Makefile
--- /dev/null
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@@ -1,100 -1,0 +1,101 @@@
-       -I$(TOP)/src/gallium/auxiliary
 +# src/gallium/targets/libgl-xlib/Makefile
 +
 +# This makefile produces a "stand-alone" libGL.so which is based on
 +# Xlib (no DRI HW acceleration)
 +
 +
 +TOP = ../../../..
 +include $(TOP)/configs/current
 +
 +
 +GL_MAJOR = 1
 +GL_MINOR = 5
 +GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 +
 +
 +INCLUDE_DIRS = \
 +      -I$(TOP)/include \
 +      -I$(TOP)/src/mesa \
 +      -I$(TOP)/src/mesa/main \
 +      -I$(TOP)/src/gallium/include \
 +      -I$(TOP)/src/gallium/drivers \
 +      -I$(TOP)/src/gallium/state_trackers/glx/xlib \
++      -I$(TOP)/src/gallium/auxiliary \
++      $(X11_CFLAGS)
 +
 +DEFINES += \
 +      -DGALLIUM_SOFTPIPE
 +#-DGALLIUM_CELL will be defined by the config */
 +
 +XLIB_TARGET_SOURCES = \
 +      xlib.c
 +
 +
 +XLIB_TARGET_OBJECTS = $(XLIB_TARGET_SOURCES:.c=.o)
 +
 +
 +# Note: CELL_SPU_LIB is only defined for cell configs
 +
 +LIBS = \
 +      $(GALLIUM_DRIVERS) \
 +      $(TOP)/src/gallium/state_trackers/glx/xlib/libxlib.a \
 +      $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \
 +      $(TOP)/src/gallium/drivers/trace/libtrace.a \
 +      $(TOP)/src/gallium/drivers/identity/libidentity.a \
 +      $(TOP)/src/mesa/libglapi.a \
 +      $(TOP)/src/mesa/libmesagallium.a \
 +      $(GALLIUM_AUXILIARIES) \
 +      $(CELL_SPU_LIB) \
 +
 +
 +.SUFFIXES : .cpp
 +
 +.c.o:
 +      $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 +
 +.cpp.o:
 +      $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
 +
 +
 +
 +default: $(TOP)/$(LIB_DIR)/gallium $(TOP)/$(LIB_DIR)/gallium/$(GL_LIB_NAME)
 +
 +$(TOP)/$(LIB_DIR)/gallium:
 +      @ mkdir -p $(TOP)/$(LIB_DIR)/gallium
 +
 +# Make the libGL.so library
 +$(TOP)/$(LIB_DIR)/gallium/$(GL_LIB_NAME): $(XLIB_TARGET_OBJECTS) $(LIBS) Makefile
 +      $(TOP)/bin/mklib -o $(GL_LIB) \
 +              -linker "$(CC)" \
 +              -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 +              -install $(TOP)/$(LIB_DIR)/gallium \
 +              $(MKLIB_OPTIONS) $(XLIB_TARGET_OBJECTS) \
 +              -Wl,--start-group $(LIBS) -Wl,--end-group $(GL_LIB_DEPS)
 +
 +
 +depend: $(XLIB_TARGET_SOURCES)
 +      @ echo "running $(MKDEP)"
 +      @ rm -f depend  # workaround oops on gutsy?!?
 +      @ touch depend
 +      $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(XLIB_TARGET_SOURCES) \
 +              > /dev/null 2>/dev/null
 +
 +
 +install: default
 +      $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
 +      $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
 +      $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(DESTDIR)$(INSTALL_DIR)/include/GL
 +      @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
 +              $(MINSTALL) $(TOP)/$(LIB_DIR)/libGL* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR); \
 +      fi
 +
 +
 +# Emacs tags
 +tags:
 +      etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 +
 +clean:
 +      -rm -f *.o
 +
 +
 +include depend