gallium: Make dri drivers create a egl_name_dri.so if supported

diff --git a/src/gallium/winsys/dri/Makefile.template b/src/gallium/winsys/dri/Makefile.template
index 07abfa53f38c31a52f599eabf08b2ec4626a022e..80e817b808244e651442e1f9ff8f287bb699192f 100644 (file)
--- a/src/gallium/winsys/dri/Makefile.template
+++ b/src/gallium/winsys/dri/Makefile.template
@@ -79,17 +79,25 @@ SHARED_INCLUDES = \
 
 ##### TARGETS #####
 
-default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
+default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME) $(LIBNAME_EGL) $(TOP)/$(LIB_DIR)/$(LIBNAME_EGL)
 
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
        $(TOP)/bin/mklib -noprefix -o $@ \
                $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES)  $(WINOBJ) $(DRI_LIB_DEPS)
 
+$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
+       $(TOP)/bin/mklib -o $(LIBNAME_EGL) \
+               -linker "$(CC)" \
+               -noprefix \
+               $(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
+               --whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive
 
 $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
        $(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
 
+$(TOP)/$(LIB_DIR)/$(LIBNAME_EGL): $(LIBNAME_EGL)
+       $(INSTALL) $(LIBNAME_EGL) $(TOP)/$(LIB_DIR) 
 
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
        rm -f depend

diff --git a/src/gallium/winsys/dri/intel/Makefile b/src/gallium/winsys/dri/intel/Makefile
index 5b51f0815d5c7026f664a9fb84aac0bb5e48d808..e0716ea28eaef9825a11c61de1f3d22a1a0fe657 100644 (file)
--- a/src/gallium/winsys/dri/intel/Makefile
+++ b/src/gallium/winsys/dri/intel/Makefile
@@ -3,6 +3,7 @@ TOP = ../../../../..
 include $(TOP)/configs/current
 
 LIBNAME = i915_dri.so
+LIBNAME_EGL = egl_i915_dri.so
 
 PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \