Move dri_util.[ch] and glcontextmodes.[ch] from dri_client to common.

diff --git a/src/mesa/drivers/dri/dri_client/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
similarity index 100%
rename from src/mesa/drivers/dri/dri_client/dri_util.c
rename to src/mesa/drivers/dri/common/dri_util.c

diff --git a/src/mesa/drivers/dri/dri_client/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
similarity index 100%
rename from src/mesa/drivers/dri/dri_client/dri_util.h
rename to src/mesa/drivers/dri/common/dri_util.h

diff --git a/src/mesa/drivers/dri/dri_client/glcontextmodes.c b/src/mesa/drivers/dri/common/glcontextmodes.c
similarity index 100%
rename from src/mesa/drivers/dri/dri_client/glcontextmodes.c
rename to src/mesa/drivers/dri/common/glcontextmodes.c

diff --git a/src/mesa/drivers/dri/dri_client/glcontextmodes.h b/src/mesa/drivers/dri/common/glcontextmodes.h
similarity index 100%
rename from src/mesa/drivers/dri/dri_client/glcontextmodes.h
rename to src/mesa/drivers/dri/common/glcontextmodes.h

diff --git a/src/mesa/drivers/dri/dri_client/Makefile b/src/mesa/drivers/dri/dri_client/Makefile
index 48ec3cc..6fcfab7 100644 (file)
--- a/src/mesa/drivers/dri/dri_client/Makefile
+++ b/src/mesa/drivers/dri/dri_client/Makefile
@@ -8,8 +8,6 @@ include $(TOP)/configs/current
 DEFINES += -DGLX_DIRECT_RENDERING 
 
 C_SOURCES = \
-       dri_util.c \
-       glcontextmodes.c \
        xf86drm.c \
        xf86drmHash.c \
        xf86drmRandom.c \

diff --git a/src/mesa/drivers/dri/ffb/Makefile b/src/mesa/drivers/dri/ffb/Makefile
index 05972ca..564832d 100644 (file)
--- a/src/mesa/drivers/dri/ffb/Makefile
+++ b/src/mesa/drivers/dri/ffb/Makefile
@@ -15,6 +15,8 @@ COMMON_SOURCES = \
        ../common/texmem.c \
        ../common/vblank.c \
        ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        ffb_bitmap.c \

diff --git a/src/mesa/drivers/dri/gamma/Makefile b/src/mesa/drivers/dri/gamma/Makefile
index e722461..e95518e 100644 (file)
--- a/src/mesa/drivers/dri/gamma/Makefile
+++ b/src/mesa/drivers/dri/gamma/Makefile
@@ -13,7 +13,9 @@ COMMON_SOURCES = \
        ../common/mm.c \
        ../common/utils.c \
        ../common/texmem.c \
-       ../common/vblank.c
+       ../common/vblank.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        gamma_context.c \

diff --git a/src/mesa/drivers/dri/i810/Makefile b/src/mesa/drivers/dri/i810/Makefile
index 4f36a33..ac792a5 100644 (file)
--- a/src/mesa/drivers/dri/i810/Makefile
+++ b/src/mesa/drivers/dri/i810/Makefile
@@ -13,7 +13,9 @@ COMMON_SOURCES = \
         ../common/mm.c \
         ../common/utils.c \
         ../common/texmem.c \
-        ../common/vblank.c
+        ../common/vblank.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        i810context.c \

diff --git a/src/mesa/drivers/dri/i830/Makefile b/src/mesa/drivers/dri/i830/Makefile
index 8a75927..d2db225 100644 (file)
--- a/src/mesa/drivers/dri/i830/Makefile
+++ b/src/mesa/drivers/dri/i830/Makefile
@@ -11,7 +11,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        i830_context.c \

diff --git a/src/mesa/drivers/dri/mach64/Makefile b/src/mesa/drivers/dri/mach64/Makefile
index c855f4d..4fd3e26 100644 (file)
--- a/src/mesa/drivers/dri/mach64/Makefile
+++ b/src/mesa/drivers/dri/mach64/Makefile
@@ -14,7 +14,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        mach64_context.c \

diff --git a/src/mesa/drivers/dri/mga/Makefile b/src/mesa/drivers/dri/mga/Makefile
index 58c925d..80089e7 100644 (file)
--- a/src/mesa/drivers/dri/mga/Makefile
+++ b/src/mesa/drivers/dri/mga/Makefile
@@ -13,7 +13,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        mgadd.c \

diff --git a/src/mesa/drivers/dri/r128/Makefile b/src/mesa/drivers/dri/r128/Makefile
index bcda0a4..65e872e 100644 (file)
--- a/src/mesa/drivers/dri/r128/Makefile
+++ b/src/mesa/drivers/dri/r128/Makefile
@@ -13,7 +13,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        r128_context.c \

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 66835ca..a2aeeb5 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -13,7 +13,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = r200_context.c \
                 r200_ioctl.c \

diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index 191ac8c..b9f9186 100644 (file)
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -14,7 +14,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        radeon_context.c \

diff --git a/src/mesa/drivers/dri/sis/Makefile b/src/mesa/drivers/dri/sis/Makefile
index 0c1c508..bd4c020 100644 (file)
--- a/src/mesa/drivers/dri/sis/Makefile
+++ b/src/mesa/drivers/dri/sis/Makefile
@@ -15,7 +15,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        sis_alloc.c \

diff --git a/src/mesa/drivers/dri/tdfx/Makefile b/src/mesa/drivers/dri/tdfx/Makefile
index 6517285..5c51012 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/Makefile
+++ b/src/mesa/drivers/dri/tdfx/Makefile
@@ -14,7 +14,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        tdfx_context.c \

diff --git a/src/mesa/drivers/dri/unichrome/Makefile b/src/mesa/drivers/dri/unichrome/Makefile
index 5cef902..1d43e5d 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/Makefile
+++ b/src/mesa/drivers/dri/unichrome/Makefile
@@ -13,7 +13,9 @@ COMMON_SOURCES = \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
-       ../common/xmlconfig.c
+       ../common/xmlconfig.c \
+       ../common/dri_util.c \
+       ../common/glcontextmodes.c
 
 DRIVER_SOURCES = \
        via_context.c \

diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile
index b98441a..9804411 100644 (file)
--- a/src/mesa/drivers/dri/x11/Makefile
+++ b/src/mesa/drivers/dri/x11/Makefile
@@ -7,7 +7,7 @@ LIBNAME = x11_dri.so
 
 DRIVER_SOURCES = x11_dri.c \
                 $(TOP)/src/mesa/drivers/common/driverfuncs.c \
-                ../dri_client/dri_util.c \
+                ../common/dri_util.c \
                 ../../x11/xm_api.c \
                 ../../x11/xm_dd.c \
                 ../../x11/xm_line.c \