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

18 files changed, 36 insertions, 14 deletions

diff --git a/src/mesa/drivers/dri/dri_client/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 03d92c02f2e..03d92c02f2e 100644
--- a/src/mesa/drivers/dri/dri_client/dri_util.c
+++ b/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
index 5c198810f72..5c198810f72 100644
--- a/src/mesa/drivers/dri/dri_client/dri_util.h
+++ b/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
index 784ad30259b..784ad30259b 100644
--- a/src/mesa/drivers/dri/dri_client/glcontextmodes.c
+++ b/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
index 5f8fa4f3116..5f8fa4f3116 100644
--- a/src/mesa/drivers/dri/dri_client/glcontextmodes.h
+++ b/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 48ec3cce4e4..6fcfab7ec9c 100644
--- 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 05972ca70f6..564832d5ee6 100644
--- 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 e72246100c3..e95518eada7 100644
--- 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 4f36a33762f..ac792a527d0 100644
--- 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 8a75927081d..d2db225c7d0 100644
--- 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 c855f4d882a..4fd3e26a3a3 100644
--- 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 58c925da487..80089e75472 100644
--- 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 bcda0a4d7d6..65e872e90ca 100644
--- 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 66835ca30de..a2aeeb5a945 100644
--- 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 191ac8c46d4..b9f9186f593 100644
--- 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 0c1c5081c74..bd4c0201d07 100644
--- 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 6517285e4ba..5c51012d7b5 100644
--- 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 5cef902860d..1d43e5d8b90 100644
--- 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 b98441a299a..9804411030f 100644
--- 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 \