aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configs
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-20 08:40:57 +0200
committermarha <marha@users.sourceforge.net>2011-09-20 08:40:57 +0200
commit0470a59df89ab453bdbe0fc2f820278cfffdc61c (patch)
tree5482d527c8426219414edc60d3891764ca2b1a20 /mesalib/configs
parentb2c925e360e2c366526de15b44603f855f94139c (diff)
downloadvcxsrv-0470a59df89ab453bdbe0fc2f820278cfffdc61c.tar.gz
vcxsrv-0470a59df89ab453bdbe0fc2f820278cfffdc61c.tar.bz2
vcxsrv-0470a59df89ab453bdbe0fc2f820278cfffdc61c.zip
libX11 libxtrans mesa git update 20 sep 2011
Diffstat (limited to 'mesalib/configs')
-rw-r--r--mesalib/configs/aix1
-rw-r--r--mesalib/configs/aix-641
-rw-r--r--mesalib/configs/aix-64-static1
-rw-r--r--mesalib/configs/aix-gcc1
-rw-r--r--mesalib/configs/aix-static1
-rw-r--r--mesalib/configs/autoconf.in1
-rw-r--r--mesalib/configs/bluegene-osmesa1
-rw-r--r--mesalib/configs/bluegene-xlc-osmesa1
-rw-r--r--mesalib/configs/catamount-osmesa-pgi1
-rw-r--r--mesalib/configs/darwin1
-rw-r--r--mesalib/configs/default2
-rw-r--r--mesalib/configs/freebsd1
-rw-r--r--mesalib/configs/hpux101
-rw-r--r--mesalib/configs/hpux10-gcc1
-rw-r--r--mesalib/configs/hpux10-static2
-rw-r--r--mesalib/configs/hpux11-321
-rw-r--r--mesalib/configs/hpux11-32-static1
-rw-r--r--mesalib/configs/hpux11-32-static-nothreads1
-rw-r--r--mesalib/configs/hpux11-641
-rw-r--r--mesalib/configs/hpux11-64-static1
-rw-r--r--mesalib/configs/hpux11-ia64-static1
-rw-r--r--mesalib/configs/hpux91
-rw-r--r--mesalib/configs/hpux9-gcc1
-rw-r--r--mesalib/configs/irix6-641
-rw-r--r--mesalib/configs/irix6-64-static1
-rw-r--r--mesalib/configs/irix6-n321
-rw-r--r--mesalib/configs/irix6-n32-static1
-rw-r--r--mesalib/configs/irix6-o321
-rw-r--r--mesalib/configs/irix6-o32-static1
-rw-r--r--mesalib/configs/linux-alpha1
-rw-r--r--mesalib/configs/linux-alpha-static1
-rw-r--r--mesalib/configs/linux-ia64-icc1
-rw-r--r--mesalib/configs/linux-ia64-icc-static1
-rw-r--r--mesalib/configs/linux-icc1
-rw-r--r--mesalib/configs/linux-icc-static1
-rw-r--r--mesalib/configs/linux-osmesa1
-rw-r--r--mesalib/configs/linux-osmesa-static1
-rw-r--r--mesalib/configs/linux-osmesa161
-rw-r--r--mesalib/configs/linux-osmesa16-static1
-rw-r--r--mesalib/configs/linux-osmesa321
-rw-r--r--mesalib/configs/linux-static1
-rw-r--r--mesalib/configs/linux-x86-64-static1
-rw-r--r--mesalib/configs/linux-x86-static1
-rw-r--r--mesalib/configs/netbsd1
-rw-r--r--mesalib/configs/openbsd1
-rw-r--r--mesalib/configs/osf11
-rw-r--r--mesalib/configs/osf1-static1
-rw-r--r--mesalib/configs/solaris-x861
-rw-r--r--mesalib/configs/solaris-x86-gcc1
-rw-r--r--mesalib/configs/solaris-x86-gcc-static1
-rw-r--r--mesalib/configs/sunos41
-rw-r--r--mesalib/configs/sunos4-gcc1
-rw-r--r--mesalib/configs/sunos4-static1
-rw-r--r--mesalib/configs/sunos51
-rw-r--r--mesalib/configs/sunos5-gcc1
-rw-r--r--mesalib/configs/sunos5-smp1
-rw-r--r--mesalib/configs/sunos5-v81
-rw-r--r--mesalib/configs/sunos5-v8-static1
-rw-r--r--mesalib/configs/sunos5-v91
-rw-r--r--mesalib/configs/sunos5-v9-cc-g++1
-rw-r--r--mesalib/configs/sunos5-v9-static1
-rw-r--r--mesalib/configs/ultrix-gcc1
62 files changed, 0 insertions, 64 deletions
diff --git a/mesalib/configs/aix b/mesalib/configs/aix
index 5d346d51d..e5153b060 100644
--- a/mesalib/configs/aix
+++ b/mesalib/configs/aix
@@ -24,5 +24,4 @@ GL_LIB_DEPS = -lX11 -lXext -lpthread -lm
GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
diff --git a/mesalib/configs/aix-64 b/mesalib/configs/aix-64
index a048c55a9..faa104cbf 100644
--- a/mesalib/configs/aix-64
+++ b/mesalib/configs/aix-64
@@ -21,5 +21,4 @@ OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
diff --git a/mesalib/configs/aix-64-static b/mesalib/configs/aix-64-static
index ee4147f9e..b9c878bb8 100644
--- a/mesalib/configs/aix-64-static
+++ b/mesalib/configs/aix-64-static
@@ -19,6 +19,5 @@ GLU_LIB_NAME = libGLU.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
-APP_LIB_DEPS = -q64 -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-lX11 -lXext -lXmu -lXi -lm -lpthread -lC
diff --git a/mesalib/configs/aix-gcc b/mesalib/configs/aix-gcc
index 223e809b3..f3fd6c918 100644
--- a/mesalib/configs/aix-gcc
+++ b/mesalib/configs/aix-gcc
@@ -18,5 +18,4 @@ CXXFLAGS += -fno-strict-aliasing
MKLIB_OPTIONS = -arch aix-gcc
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi
diff --git a/mesalib/configs/aix-static b/mesalib/configs/aix-static
index 33508481c..0068ba413 100644
--- a/mesalib/configs/aix-static
+++ b/mesalib/configs/aix-static
@@ -18,7 +18,6 @@ GLU_LIB_NAME = libGLU.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-lX11 -lXext -lXmu -lXi -lm -lpthread -lC
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 37b7ea5bd..9bbafc93a 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -140,7 +140,6 @@ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLU_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @GLU_LIB_DEPS@
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@
GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@
VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
diff --git a/mesalib/configs/bluegene-osmesa b/mesalib/configs/bluegene-osmesa
index 88511109d..3fa0a0483 100644
--- a/mesalib/configs/bluegene-osmesa
+++ b/mesalib/configs/bluegene-osmesa
@@ -29,4 +29,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU -lm
diff --git a/mesalib/configs/bluegene-xlc-osmesa b/mesalib/configs/bluegene-xlc-osmesa
index 292199a61..262b9734e 100644
--- a/mesalib/configs/bluegene-xlc-osmesa
+++ b/mesalib/configs/bluegene-xlc-osmesa
@@ -25,4 +25,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU -lm
diff --git a/mesalib/configs/catamount-osmesa-pgi b/mesalib/configs/catamount-osmesa-pgi
index 74fd53ab8..d660de3f8 100644
--- a/mesalib/configs/catamount-osmesa-pgi
+++ b/mesalib/configs/catamount-osmesa-pgi
@@ -28,4 +28,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU -lm
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
index 83f417ce0..98cd457a0 100644
--- a/mesalib/configs/darwin
+++ b/mesalib/configs/darwin
@@ -48,7 +48,6 @@ GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -
OSMESA_LIB_DEPS =
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu
GLU_DIRS = sgi
diff --git a/mesalib/configs/default b/mesalib/configs/default
index 078c85e8b..43666110b 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -135,7 +135,6 @@ EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread
OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
@@ -144,7 +143,6 @@ WAYLAND_EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -lwayland-client -ldrm
GBM_LIB_DEPS = $(EXTRA_LIB_PATH) -ludev -ldl
# Program dependencies - specific GL libraries added in Makefiles
-APP_LIB_DEPS = -lm
X11_LIBS = -lX11
DLOPEN_LIBS = -ldl
diff --git a/mesalib/configs/freebsd b/mesalib/configs/freebsd
index 00d46be88..70b0e03e9 100644
--- a/mesalib/configs/freebsd
+++ b/mesalib/configs/freebsd
@@ -27,4 +27,3 @@ CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
EXTRA_LIB_PATH = -L/usr/local/lib
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
diff --git a/mesalib/configs/hpux10 b/mesalib/configs/hpux10
index 9ec08c0bb..fff274046 100644
--- a/mesalib/configs/hpux10
+++ b/mesalib/configs/hpux10
@@ -11,4 +11,3 @@ CXX = aCC
CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
-APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/mesalib/configs/hpux10-gcc b/mesalib/configs/hpux10-gcc
index 40f243c23..cd38fa23a 100644
--- a/mesalib/configs/hpux10-gcc
+++ b/mesalib/configs/hpux10-gcc
@@ -15,5 +15,4 @@ CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/mesalib/configs/hpux10-static b/mesalib/configs/hpux10-static
index 18847d927..82f480c06 100644
--- a/mesalib/configs/hpux10-static
+++ b/mesalib/configs/hpux10-static
@@ -24,5 +24,3 @@ GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLW_LIB_DEPS =
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++
diff --git a/mesalib/configs/hpux11-32 b/mesalib/configs/hpux11-32
index d783ae021..41888f39e 100644
--- a/mesalib/configs/hpux11-32
+++ b/mesalib/configs/hpux11-32
@@ -22,7 +22,6 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/mesalib/configs/hpux11-32-static b/mesalib/configs/hpux11-32-static
index 58a1c638f..40352fb7d 100644
--- a/mesalib/configs/hpux11-32-static
+++ b/mesalib/configs/hpux11-32-static
@@ -22,5 +22,4 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl
diff --git a/mesalib/configs/hpux11-32-static-nothreads b/mesalib/configs/hpux11-32-static-nothreads
index fa3d4c2d7..a2a8eda46 100644
--- a/mesalib/configs/hpux11-32-static-nothreads
+++ b/mesalib/configs/hpux11-32-static-nothreads
@@ -22,4 +22,3 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/mesalib/configs/hpux11-64 b/mesalib/configs/hpux11-64
index 0f963e2e5..0e5ef56bb 100644
--- a/mesalib/configs/hpux11-64
+++ b/mesalib/configs/hpux11-64
@@ -23,7 +23,6 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/mesalib/configs/hpux11-64-static b/mesalib/configs/hpux11-64-static
index 4161d535f..787f92799 100644
--- a/mesalib/configs/hpux11-64-static
+++ b/mesalib/configs/hpux11-64-static
@@ -23,4 +23,3 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl
diff --git a/mesalib/configs/hpux11-ia64-static b/mesalib/configs/hpux11-ia64-static
index de24a1514..cadb12239 100644
--- a/mesalib/configs/hpux11-ia64-static
+++ b/mesalib/configs/hpux11-ia64-static
@@ -23,4 +23,3 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl
diff --git a/mesalib/configs/hpux9 b/mesalib/configs/hpux9
index d0105e5c8..c37c2005e 100644
--- a/mesalib/configs/hpux9
+++ b/mesalib/configs/hpux9
@@ -12,5 +12,4 @@ CXX = c++
CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm
diff --git a/mesalib/configs/hpux9-gcc b/mesalib/configs/hpux9-gcc
index df3042056..e7fe6847b 100644
--- a/mesalib/configs/hpux9-gcc
+++ b/mesalib/configs/hpux9-gcc
@@ -11,4 +11,3 @@ CXX = aCC
CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/mesalib/configs/irix6-64 b/mesalib/configs/irix6-64
index aae6d78ea..c2e6216ea 100644
--- a/mesalib/configs/irix6-64
+++ b/mesalib/configs/irix6-64
@@ -14,4 +14,3 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib64
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm
diff --git a/mesalib/configs/irix6-64-static b/mesalib/configs/irix6-64-static
index e61f6247b..9a22f4e11 100644
--- a/mesalib/configs/irix6-64-static
+++ b/mesalib/configs/irix6-64-static
@@ -15,7 +15,6 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib64
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/mesalib/configs/irix6-n32 b/mesalib/configs/irix6-n32
index 8a7817343..b02537548 100644
--- a/mesalib/configs/irix6-n32
+++ b/mesalib/configs/irix6-n32
@@ -14,4 +14,3 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lpthread -lm
diff --git a/mesalib/configs/irix6-n32-static b/mesalib/configs/irix6-n32-static
index 47b5e5067..83eb5c0c0 100644
--- a/mesalib/configs/irix6-n32-static
+++ b/mesalib/configs/irix6-n32-static
@@ -15,7 +15,6 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/mesalib/configs/irix6-o32 b/mesalib/configs/irix6-o32
index 1e4c8c53e..ab50953ed 100644
--- a/mesalib/configs/irix6-o32
+++ b/mesalib/configs/irix6-o32
@@ -14,5 +14,4 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
diff --git a/mesalib/configs/irix6-o32-static b/mesalib/configs/irix6-o32-static
index 58fbe4e8e..2e62c1b56 100644
--- a/mesalib/configs/irix6-o32-static
+++ b/mesalib/configs/irix6-o32-static
@@ -15,7 +15,6 @@ GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/mesalib/configs/linux-alpha b/mesalib/configs/linux-alpha
index 803873979..f80c972bb 100644
--- a/mesalib/configs/linux-alpha
+++ b/mesalib/configs/linux-alpha
@@ -16,5 +16,4 @@ CXXFLAGS += -fno-strict-aliasing
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/linux-alpha-static b/mesalib/configs/linux-alpha-static
index 33938e85b..8b2265cb1 100644
--- a/mesalib/configs/linux-alpha-static
+++ b/mesalib/configs/linux-alpha-static
@@ -25,4 +25,3 @@ OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm
diff --git a/mesalib/configs/linux-ia64-icc b/mesalib/configs/linux-ia64-icc
index 1594256c5..8bd90cca2 100644
--- a/mesalib/configs/linux-ia64-icc
+++ b/mesalib/configs/linux-ia64-icc
@@ -14,6 +14,5 @@ MKLIB_OPTIONS = -arch icc-istatic
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
diff --git a/mesalib/configs/linux-ia64-icc-static b/mesalib/configs/linux-ia64-icc-static
index b5c33a525..f926fb3d9 100644
--- a/mesalib/configs/linux-ia64-icc-static
+++ b/mesalib/configs/linux-ia64-icc-static
@@ -20,5 +20,4 @@ OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS =
GLU_LIB_DEPS =
GLW_LIB_DEPS =
-APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind
diff --git a/mesalib/configs/linux-icc b/mesalib/configs/linux-icc
index 2cfb2025f..9d164250c 100644
--- a/mesalib/configs/linux-icc
+++ b/mesalib/configs/linux-icc
@@ -12,7 +12,6 @@ CXXFLAGS = -O3
MKLIB_OPTIONS = -arch icc
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
MESA_ASM_SOURCES = $(X86_SOURCES)
GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/mesalib/configs/linux-icc-static b/mesalib/configs/linux-icc-static
index d0311962a..b9c09d4a1 100644
--- a/mesalib/configs/linux-icc-static
+++ b/mesalib/configs/linux-icc-static
@@ -18,7 +18,6 @@ GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS =
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
MESA_ASM_SOURCES = $(X86_SOURCES)
GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/mesalib/configs/linux-osmesa b/mesalib/configs/linux-osmesa
index 4cc5e51f1..5d7ab463f 100644
--- a/mesalib/configs/linux-osmesa
+++ b/mesalib/configs/linux-osmesa
@@ -24,4 +24,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread -ldl
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lm -lpthread
diff --git a/mesalib/configs/linux-osmesa-static b/mesalib/configs/linux-osmesa-static
index d3af7a9d3..00154900a 100644
--- a/mesalib/configs/linux-osmesa-static
+++ b/mesalib/configs/linux-osmesa-static
@@ -30,5 +30,4 @@ GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLW_LIB_DEPS =
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
$(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
diff --git a/mesalib/configs/linux-osmesa16 b/mesalib/configs/linux-osmesa16
index e6c26a286..c424214fe 100644
--- a/mesalib/configs/linux-osmesa16
+++ b/mesalib/configs/linux-osmesa16
@@ -27,4 +27,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lm -lpthread
diff --git a/mesalib/configs/linux-osmesa16-static b/mesalib/configs/linux-osmesa16-static
index a6c0cab1b..50ae18321 100644
--- a/mesalib/configs/linux-osmesa16-static
+++ b/mesalib/configs/linux-osmesa16-static
@@ -28,4 +28,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lm -lpthread
diff --git a/mesalib/configs/linux-osmesa32 b/mesalib/configs/linux-osmesa32
index dafa31b2e..6602c325e 100644
--- a/mesalib/configs/linux-osmesa32
+++ b/mesalib/configs/linux-osmesa32
@@ -27,4 +27,3 @@ DRIVER_DIRS = osmesa
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lm -lpthread
diff --git a/mesalib/configs/linux-static b/mesalib/configs/linux-static
index 2b97daad8..8a8db6edc 100644
--- a/mesalib/configs/linux-static
+++ b/mesalib/configs/linux-static
@@ -20,5 +20,4 @@ GLU_LIB_DEPS =
GLW_LIB_DEPS =
# Need to specify all libraries we may need
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \
-l$(GL_LIB) -lm -L/usr/X11R6/lib/ -lX11 -lXext -lXmu -lXi -lpthread
diff --git a/mesalib/configs/linux-x86-64-static b/mesalib/configs/linux-x86-64-static
index 89a0e3e03..dfb136f92 100644
--- a/mesalib/configs/linux-x86-64-static
+++ b/mesalib/configs/linux-x86-64-static
@@ -20,6 +20,5 @@ GLU_LIB_DEPS =
GLW_LIB_DEPS =
# Need to specify all libraries we may need
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
-l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \
$(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lstdc++ -lm
diff --git a/mesalib/configs/linux-x86-static b/mesalib/configs/linux-x86-static
index dba6299e4..19151d203 100644
--- a/mesalib/configs/linux-x86-static
+++ b/mesalib/configs/linux-x86-static
@@ -20,5 +20,4 @@ GLU_LIB_DEPS =
GLW_LIB_DEPS =
# Need to specify all libraries we may need
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \
-l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lstdc++ -lm
diff --git a/mesalib/configs/netbsd b/mesalib/configs/netbsd
index c65e90199..e74ca632e 100644
--- a/mesalib/configs/netbsd
+++ b/mesalib/configs/netbsd
@@ -9,7 +9,6 @@ CC = gcc
CXX = g++
CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100
CXXFLAGS = -O2 -fPIC
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
diff --git a/mesalib/configs/openbsd b/mesalib/configs/openbsd
index 982675fa2..259da0b08 100644
--- a/mesalib/configs/openbsd
+++ b/mesalib/configs/openbsd
@@ -17,5 +17,4 @@ CXXFLAGS += -fno-strict-aliasing
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/osf1 b/mesalib/configs/osf1
index 5a2e1f2ec..782f483c0 100644
--- a/mesalib/configs/osf1
+++ b/mesalib/configs/osf1
@@ -12,4 +12,3 @@ CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm
diff --git a/mesalib/configs/osf1-static b/mesalib/configs/osf1-static
index f20005da1..ccc97ac38 100644
--- a/mesalib/configs/osf1-static
+++ b/mesalib/configs/osf1-static
@@ -13,4 +13,3 @@ MKLIB_OPTIONS = -static
GL_LIB_DEPS =
GLU_LIB_DEPS =
-APP_LIB_DEPS = -noso -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -lXmu -lXi -lpthread -lm -lcxx
diff --git a/mesalib/configs/solaris-x86 b/mesalib/configs/solaris-x86
index 3c64d35a1..2975f5752 100644
--- a/mesalib/configs/solaris-x86
+++ b/mesalib/configs/solaris-x86
@@ -9,7 +9,6 @@ CC = cc
CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
MKLIB_OPTIONS = -static
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lGLU -lGL
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/mesalib/configs/solaris-x86-gcc b/mesalib/configs/solaris-x86-gcc
index 065ce369f..baa306482 100644
--- a/mesalib/configs/solaris-x86-gcc
+++ b/mesalib/configs/solaris-x86-gcc
@@ -16,4 +16,3 @@ CXXFLAGS += -fno-strict-aliasing
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu
diff --git a/mesalib/configs/solaris-x86-gcc-static b/mesalib/configs/solaris-x86-gcc-static
index dd12084b7..9d2aa52c5 100644
--- a/mesalib/configs/solaris-x86-gcc-static
+++ b/mesalib/configs/solaris-x86-gcc-static
@@ -17,7 +17,6 @@ CXXFLAGS += -fno-strict-aliasing
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/mesalib/configs/sunos4 b/mesalib/configs/sunos4
index 9e6627dc0..f8f1e7532 100644
--- a/mesalib/configs/sunos4
+++ b/mesalib/configs/sunos4
@@ -7,6 +7,5 @@ CONFIG_NAME = sunos4
# Compiler and flags
CC = acc
CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm
diff --git a/mesalib/configs/sunos4-gcc b/mesalib/configs/sunos4-gcc
index 85439c93b..36a75497a 100644
--- a/mesalib/configs/sunos4-gcc
+++ b/mesalib/configs/sunos4-gcc
@@ -14,5 +14,4 @@ CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
diff --git a/mesalib/configs/sunos4-static b/mesalib/configs/sunos4-static
index b05184d46..4432bfd71 100644
--- a/mesalib/configs/sunos4-static
+++ b/mesalib/configs/sunos4-static
@@ -20,4 +20,3 @@ GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLW_LIB_DEPS =
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm
diff --git a/mesalib/configs/sunos5 b/mesalib/configs/sunos5
index b3d3fc6ed..3632dabf6 100644
--- a/mesalib/configs/sunos5
+++ b/mesalib/configs/sunos5
@@ -13,4 +13,3 @@ CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include
GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/sunos5-gcc b/mesalib/configs/sunos5-gcc
index e4d340363..f9c1dfab5 100644
--- a/mesalib/configs/sunos5-gcc
+++ b/mesalib/configs/sunos5-gcc
@@ -35,4 +35,3 @@ CXXFLAGS += -fno-strict-aliasing
EXTRA_LIB_PATH=-L/usr/openwin/lib
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/sunos5-smp b/mesalib/configs/sunos5-smp
index 93132b643..2d3e1026e 100644
--- a/mesalib/configs/sunos5-smp
+++ b/mesalib/configs/sunos5-smp
@@ -13,5 +13,4 @@ CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/open
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun
diff --git a/mesalib/configs/sunos5-v8 b/mesalib/configs/sunos5-v8
index 19ff67b15..5a7be86e1 100644
--- a/mesalib/configs/sunos5-v8
+++ b/mesalib/configs/sunos5-v8
@@ -13,4 +13,3 @@ CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREAD
GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/sunos5-v8-static b/mesalib/configs/sunos5-v8-static
index edb3227c5..b3b182d17 100644
--- a/mesalib/configs/sunos5-v8-static
+++ b/mesalib/configs/sunos5-v8-static
@@ -12,4 +12,3 @@ CXX = CC
CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun
diff --git a/mesalib/configs/sunos5-v9 b/mesalib/configs/sunos5-v9
index 28b402ee1..6ebe0ee49 100644
--- a/mesalib/configs/sunos5-v9
+++ b/mesalib/configs/sunos5-v9
@@ -17,5 +17,4 @@ CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREAD
GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/sunos5-v9-cc-g++ b/mesalib/configs/sunos5-v9-cc-g++
index a303f891d..a9e9bd3e9 100644
--- a/mesalib/configs/sunos5-v9-cc-g++
+++ b/mesalib/configs/sunos5-v9-cc-g++
@@ -30,4 +30,3 @@ CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM
GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/sunos5-v9-static b/mesalib/configs/sunos5-v9-static
index ccf5eb3ce..b2da747b8 100644
--- a/mesalib/configs/sunos5-v9-static
+++ b/mesalib/configs/sunos5-v9-static
@@ -14,4 +14,3 @@ CXX = CC
CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun
diff --git a/mesalib/configs/ultrix-gcc b/mesalib/configs/ultrix-gcc
index 4414e7acd..d38260060 100644
--- a/mesalib/configs/ultrix-gcc
+++ b/mesalib/configs/ultrix-gcc
@@ -20,4 +20,3 @@ GLU_LIB_NAME = libGLU.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm