Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini.

diff --git a/configs/linux-dri b/configs/linux-dri
index a1c1c8ef4df2765f819763957a3914d93653ea35..1f6341f1e53f5ff716ed73216bb1f378203fe25f 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -34,7 +34,7 @@ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 
 
 # Directories
-SRC_DIRS = mesa glu glut/glx glw
+SRC_DIRS = mesa glu glut/glx glw glx/x11
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 71a1ebbf974bcec40f995b65b984ee20c01063f1..5656e1fcafceb4a3aae261f5ee82ffff478161c1 100644 (file)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -24,7 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
 
 # Directories
-SRC_DIRS = mesa glu glut/glx glw
+SRC_DIRS = mesa glu glut/glx glw glx/x11
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri

diff --git a/configs/linux-solo b/configs/linux-solo
index bb8cb6a27b41a55a2f2cbb528cbbd30d07910a44..0ee8b832dc5bcf7a7816550c817ff9fc84f0a935 100644 (file)
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -25,7 +25,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 
 # Directories
-SRC_DIRS = mesa glx glu glut/mini
+SRC_DIRS = mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 

diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64
index 25e23d19afc431c5369fb5928532472fa779b698..d80590570136b126be555c3c43ba2ab0ac452355 100644 (file)
--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -22,7 +22,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 
 # Directories
-SRC_DIRS = mesa glx glu glut/mini
+SRC_DIRS = mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 

diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86
index daa65480bd436dde7b09e79412620ba2c4761b89..bb00d1c9b97c6c245e39ec4351344e8c940b2551 100644 (file)
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -24,7 +24,7 @@ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 
 # Directories
-SRC_DIRS = mesa glx glu glut/mini
+SRC_DIRS = mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx