diff options
author | Chia-I Wu <[email protected]> | 2010-01-22 16:31:43 +0800 |
---|---|---|
committer | Chia-I Wu <[email protected]> | 2010-01-22 16:45:28 +0800 |
commit | 3c967a920718c2a74996ac23b8c1964915db88c2 (patch) | |
tree | c0dc48858a5abaa75cc7bb68682a7ef3e1136593 /src/gallium/winsys | |
parent | 3a4b7d3071c7377d8fbe37a0a2f486b919ff53cb (diff) |
st/egl_g3d: Rename to st/egl.
Simply the name to egl.
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r-- | src/gallium/winsys/drm/Makefile.egl (renamed from src/gallium/winsys/drm/Makefile.egl_g3d) | 6 | ||||
-rw-r--r-- | src/gallium/winsys/drm/i965/egl/Makefile (renamed from src/gallium/winsys/drm/i965/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/i965/egl/dummy.c (renamed from src/gallium/winsys/drm/i965/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/intel/egl/Makefile (renamed from src/gallium/winsys/drm/intel/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/intel/egl/dummy.c (renamed from src/gallium/winsys/drm/intel/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/nouveau/egl/Makefile (renamed from src/gallium/winsys/drm/nouveau/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/nouveau/egl/dummy.c (renamed from src/gallium/winsys/drm/nouveau/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/radeon/egl/Makefile (renamed from src/gallium/winsys/drm/radeon/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/radeon/egl/dummy.c (renamed from src/gallium/winsys/drm/radeon/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/swrast/egl/Makefile (renamed from src/gallium/winsys/drm/swrast/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/swrast/egl/dummy.c (renamed from src/gallium/winsys/drm/swrast/egl_g3d/dummy.c) | 0 | ||||
-rw-r--r-- | src/gallium/winsys/drm/vmware/egl/Makefile (renamed from src/gallium/winsys/drm/vmware/egl_g3d/Makefile) | 2 | ||||
-rw-r--r-- | src/gallium/winsys/drm/vmware/egl/dummy.c (renamed from src/gallium/winsys/drm/vmware/egl_g3d/dummy.c) | 0 |
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 |