13 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/winsys/drm/Makefile.egl_g3d b/src/gallium/winsys/drm/Makefile.egl
index d8f47396d16..1b10f1115ca 100644
--- a/src/gallium/winsys/drm/Makefile.egl_g3d
+++ b/src/gallium/winsys/drm/Makefile.egl
@@ -1,4 +1,4 @@
-# src/gallium/winsys/drm/Makefile.egl_g3d
+# src/gallium/winsys/drm/Makefile.egl
 
 # The driver Makefile should define
 #
@@ -13,10 +13,10 @@ EGL_DRIVER_OBJECTS = $(EGL_DRIVER_SOURCES:.c=.o)
 
 common_LIBS = -ldrm -lm -ldl
 
-x11_ST = $(TOP)/src/gallium/state_trackers/egl_g3d/libeglx11.a
+x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a
 x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
 
-kms_ST = $(TOP)/src/gallium/state_trackers/egl_g3d/libeglkms.a
+kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a
 kms_LIBS = $(common_LIBS)
 
 ##### RULES #####
diff --git a/src/gallium/winsys/drm/i965/egl_g3d/Makefile b/src/gallium/winsys/drm/i965/egl/Makefile
index dd2efe24855..1c132582005 100644
--- a/src/gallium/winsys/drm/i965/egl_g3d/Makefile
+++ b/src/gallium/winsys/drm/i965/egl/Makefile
@@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/i965/libi965.a
 
-include ../../Makefile.egl_g3d
+include ../../Makefile.egl
diff --git a/src/gallium/winsys/drm/i965/egl_g3d/dummy.c b/src/gallium/winsys/drm/i965/egl/dummy.c
index 4a1bc28b0b6..4a1bc28b0b6 100644
--- a/src/gallium/winsys/drm/i965/egl_g3d/dummy.c
+++ b/src/gallium/winsys/drm/i965/egl/dummy.c
diff --git a/src/gallium/winsys/drm/intel/egl_g3d/Makefile b/src/gallium/winsys/drm/intel/egl/Makefile
index cdbb680773c..60d675ca73d 100644
--- a/src/gallium/winsys/drm/intel/egl_g3d/Makefile
+++ b/src/gallium/winsys/drm/intel/egl/Makefile
@@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/i915/libi915.a
 
-include ../../Makefile.egl_g3d
+include ../../Makefile.egl
diff --git a/src/gallium/winsys/drm/intel/egl_g3d/dummy.c b/src/gallium/winsys/drm/intel/egl/dummy.c
index 4a1bc28b0b6..4a1bc28b0b6 100644
--- a/src/gallium/winsys/drm/intel/egl_g3d/dummy.c
+++ b/src/gallium/winsys/drm/intel/egl/dummy.c
diff --git a/src/gallium/winsys/drm/nouveau/egl_g3d/Makefile b/src/gallium/winsys/drm/nouveau/egl/Makefile
index 865a5d56a97..8e812acc86b 100644
--- a/src/gallium/winsys/drm/nouveau/egl_g3d/Makefile
+++ b/src/gallium/winsys/drm/nouveau/egl/Makefile
@@ -16,4 +16,4 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
 
-include ../../Makefile.egl_g3d
+include ../../Makefile.egl
diff --git a/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c b/src/gallium/winsys/drm/nouveau/egl/dummy.c
index 4a1bc28b0b6..4a1bc28b0b6 100644
--- a/src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c
+++ b/src/gallium/winsys/drm/nouveau/egl/dummy.c
diff --git a/src/gallium/winsys/drm/radeon/egl_g3d/Makefile b/src/gallium/winsys/drm/radeon/egl/Makefile
index e0de68c678f..cd4f9b20f06 100644
--- a/src/gallium/winsys/drm/radeon/egl_g3d/Makefile
+++ b/src/gallium/winsys/drm/radeon/egl/Makefile
@@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/r300/libr300.a
 
-include ../../Makefile.egl_g3d
+include ../../Makefile.egl
diff --git a/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c b/src/gallium/winsys/drm/radeon/egl/dummy.c
index 4a1bc28b0b6..4a1bc28b0b6 100644
--- a/src/gallium/winsys/drm/radeon/egl_g3d/dummy.c
+++ b/src/gallium/winsys/drm/radeon/egl/dummy.c
diff --git a/src/gallium/winsys/drm/swrast/egl_g3d/Makefile b/src/gallium/winsys/drm/swrast/egl/Makefile
index f0d051ea0ea..26fe2d2805a 100644
--- a/src/gallium/winsys/drm/swrast/egl_g3d/Makefile
+++ b/src/gallium/winsys/drm/swrast/egl/Makefile
@@ -9,4 +9,4 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/winsys/drm/swrast/core/libswrastdrm.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
 
-include ../../Makefile.egl_g3d
+include ../../Makefile.egl
diff --git a/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c b/src/gallium/winsys/drm/swrast/egl/dummy.c
index 4a1bc28b0b6..4a1bc28b0b6 100644
--- a/src/gallium/winsys/drm/swrast/egl_g3d/dummy.c
+++ b/src/gallium/winsys/drm/swrast/egl/dummy.c
diff --git a/src/gallium/winsys/drm/vmware/egl_g3d/Makefile b/src/gallium/winsys/drm/vmware/egl/Makefile
index 3cf79924e08..a3e73131c35 100644
--- a/src/gallium/winsys/drm/vmware/egl_g3d/Makefile
+++ b/src/gallium/winsys/drm/vmware/egl/Makefile
@@ -11,4 +11,4 @@ EGL_DRIVER_PIPES = \
 	$(TOP)/src/gallium/drivers/trace/libtrace.a \
 	$(TOP)/src/gallium/drivers/svga/libsvga.a
 
-include ../../Makefile.egl_g3d
+include ../../Makefile.egl
diff --git a/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c b/src/gallium/winsys/drm/vmware/egl/dummy.c
index 4a1bc28b0b6..4a1bc28b0b6 100644
--- a/src/gallium/winsys/drm/vmware/egl_g3d/dummy.c
+++ b/src/gallium/winsys/drm/vmware/egl/dummy.c