From 312c68fab3c179c6173bd25aae07be09d299ce20 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@freedesktop.org>
Date: Mon, 25 Oct 2004 21:20:29 +0000
Subject: 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.

---
 configs/linux-dri        | 3 ++-
 configs/linux-dri-x86-64 | 3 ++-
 configs/linux-solo       | 3 ++-
 configs/linux-solo-ia64  | 3 ++-
 configs/linux-solo-x86   | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 0d5210d3c1..a1c1c8ef4d 100644
--- 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 1944e2784d..71a1ebbf97 100644
--- 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 a2c9dc0671..bb8cb6a27b 100644
--- 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 71ba82b512..25e23d19af 100644
--- 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 5ab2b9f151..daa65480bd 100644
--- 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
 
-- 
cgit v1.2.3