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 0d5210d..a1c1c8e 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 1944e27..71a1ebb 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 a2c9dc0..bb8cb6a 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 71ba82b..25e23d1 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 5ab2b9f..daa6548 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