Add DRI_LIB_DEPS for the DRI drivers to link against. Remove expat from the

link list for libGL itself under DRI configurations, since the XML parsing
code is in the drivers themselves.

diff --git a/configs/linux-dri b/configs/linux-dri
index 0d5210d3c1c55b7195f503a22193f35fe71ad3a5..a1c1c8ef4df2765f819763957a3914d93653ea35 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -26,7 +26,8 @@ CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY $(WARN_FLAGS) -g $(OPT_FLAGS) -fPIC \
 ASM_SOURCES = 
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -ldl
 
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 1944e2784d80bf2f809ca58afe1c9d638d78b500..71a1ebbf974bcec40f995b65b984ee20c01063f1 100644 (file)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -18,7 +18,8 @@ CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX
 LIB_DIR = $(TOP)/lib64
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
 

diff --git a/configs/linux-solo b/configs/linux-solo
index a2c9dc0671e386a48792562d6f864134738a428a..bb8cb6a27b41a55a2f2cbb528cbbd30d07910a44 100644 (file)
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -18,7 +18,8 @@ CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC
 ASM_SOURCES = $(X86_SOURCES)
 
 # Library/program dependencies
-GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = -lm -lpthread -ldl
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 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

diff --git a/configs/linux-solo-ia64 b/configs/linux-solo-ia64
index 71ba82b512cfc5dcf70d5df9ed397b92c12bcf70..25e23d19afc431c5369fb5928532472fa779b698 100644 (file)
--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -16,7 +16,8 @@ CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC
 
 
 # Library/program dependencies
-GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = -lm -lpthread -ldl
 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
 

diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86
index 5ab2b9f151984c102e3f5eebdd8d2997fa2ebc1c..daa65480bd436dde7b09e79412620ba2c4761b89 100644 (file)
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -18,7 +18,8 @@ CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC
 ASM_SOURCES = $(X86_SOURCES)
 
 # Library/program dependencies
-GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = -lm -lpthread -ldl
 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