remove -lXm (motif) from GLW_LIB_DEPS since it's not needed by default

11 files changed, 13 insertions, 12 deletions

diff --git a/configs/default b/configs/default
index 3e010223403..ece16572d6f 100644
--- a/configs/default
+++ b/configs/default
@@ -45,7 +45,8 @@ OSMESA_LIB_NAME = libOSMesa.so
 # Optional assembly language optimization files for libGL
 ASM_SOURCES = 
 
-# GLw widget sources (Append "GLwMDrawA.c" to build the Motif widget too)
+# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
+# order to build the Motif widget too)
 GLW_SOURCES = GLwDrawA.c
 
 
@@ -63,5 +64,5 @@ GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
diff --git a/configs/linux b/configs/linux
index 7e4957188de..3504d6b4249 100644
--- a/configs/linux
+++ b/configs/linux
@@ -18,5 +18,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
diff --git a/configs/linux-debug b/configs/linux-debug
index f34288d61aa..6dad6a3237b 100644
--- a/configs/linux-debug
+++ b/configs/linux-debug
@@ -18,5 +18,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -lXt -L/usr/X11R6/lib -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -lXt -L/usr/X11R6/lib -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
diff --git a/configs/linux-dri b/configs/linux-dri
index bbc7f2d2b1e..2386906db3d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -21,7 +21,7 @@ ASM_SOURCES =
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
 
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
 
 
 # Directories
diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index 53fe0fb0e90..dc03769a504 100644
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -19,7 +19,7 @@ ASM_SOURCES = $(X86_SOURCES)
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
 
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
 
 
 # Directories
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 5e06f553672..6db0530c75c 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -20,7 +20,7 @@ LIB_DIR = $(TOP)/lib64
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lX11
 
 # Directories
 SRC_DIRS = mesa glu glut/glx glw
diff --git a/configs/linux-glide b/configs/linux-glide
index 503f0bb0773..f7f1af834cc 100644
--- a/configs/linux-glide
+++ b/configs/linux-glide
@@ -18,5 +18,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/local/glide/lib -lglide3x -lm
diff --git a/configs/linux-tcc b/configs/linux-tcc
index b6b20f2de0f..4cfd5534ced 100644
--- a/configs/linux-tcc
+++ b/configs/linux-tcc
@@ -21,5 +21,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ld
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -lXt -L/usr/X11R6/lib -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -lXt -L/usr/X11R6/lib -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
diff --git a/configs/linux-x86 b/configs/linux-x86
index 5f7cda789c8..830fcff356b 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -22,5 +22,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
diff --git a/configs/linux-x86-64 b/configs/linux-x86-64
index 7f27ed80b4c..032f10adc5b 100644
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -26,5 +26,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
diff --git a/configs/linux-x86-glide b/configs/linux-x86-glide
index 15c9f92968e..d5d4ee1b45f 100644
--- a/configs/linux-x86-glide
+++ b/configs/linux-x86-glide
@@ -22,5 +22,5 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
 GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -L/usr/local/glide/lib -lglide3x -lm