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

diff --git a/configs/default b/configs/default
index 3e010223403591082ead31cf886f2d3b71c6e4ea..ece16572d6f3b7fd19a5e9f480ed0210f8379764 100644 (file)
--- 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 7e4957188dea609fc01d452e7ecf02eddc590f08..3504d6b42491ee8ad794c7b268602098419be85a 100644 (file)
--- 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 f34288d61aab1bcc1c1ef1f40eb155accdd689b0..6dad6a3237b7f40d3ce7cfb07fc1139816f5d1d7 100644 (file)
--- 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 bbc7f2d2b1eb7c921a90f0cbacd7dbfc040e6d29..2386906db3d5e8c27cf7c11edffe2e8627b2cf88 100644 (file)
--- 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 53fe0fb0e90c8dc48010b659784dd9fc4a9156a4..dc03769a5042b399b5de07bef35a6ac0f35ab3ce 100644 (file)
--- 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 5e06f55367212d80eece584d27d4117313050336..6db0530c75c431796c91e27f7d61123ad750f743 100644 (file)
--- 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 503f0bb0773feee093fda2f832b9c312a2dc2f49..f7f1af834ccac0ffb57fdcb9208ab177e8b015a7 100644 (file)
--- 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 b6b20f2de0f384a0269c78354e1a6f628ddc99c7..4cfd5534ced2f00ccc922a49edc993ac71ce0478 100644 (file)
--- 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 5f7cda789c88ad133988ed1a1d37370903e2a180..830fcff356b3ee851d112486becb421dc75b1739 100644 (file)
--- 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 7f27ed80b4cd2ed436a44f17602c084f0bf90a0b..032f10adc5b91ea2dd56e5178125bc80da1b98bd 100644 (file)
--- 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 15c9f92968eacefe18297c531ba839f9a3eeb2db..d5d4ee1b45f3b4360e0d0b29afb21d7419536fdc 100644 (file)
--- 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