Remove unused APP_LIB_DEPS variable

Unused since removal of demos from the repository?

Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>

diff --git a/configs/aix b/configs/aix
index 5d346d51de14833d871ee7248374a4b0e2346097..e5153b0608becfb7d0fe1e670294b08bd1126489 100644 (file)
--- a/configs/aix
+++ b/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/configs/aix-64 b/configs/aix-64
index a048c55a9c063fdd491d8a12583e9ff2a1a60d0d..faa104cbf05267dbb336bcfdfc30993edb711b30 100644 (file)
--- a/configs/aix-64
+++ b/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/configs/aix-64-static b/configs/aix-64-static
index ee4147f9e24cac287194a031597fe55045f8f0e1..b9c878bb849257ae5f643d848adf7db29a277c8b 100644 (file)
--- a/configs/aix-64-static
+++ b/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/configs/aix-gcc b/configs/aix-gcc
index 223e809b3c2872fb79ce7cd4ad08b3da20b8fd62..f3fd6c918ce5798b15f4aaa610eb39c4f9734205 100644 (file)
--- a/configs/aix-gcc
+++ b/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/configs/aix-static b/configs/aix-static
index 33508481c651b20f633b29ed74fc67f31b0c503f..0068ba41330b51ebe764334a8246a4a522d55ee1 100644 (file)
--- a/configs/aix-static
+++ b/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/configs/autoconf.in b/configs/autoconf.in
index 37b7ea5bd4ff65d3c2cb8aad04df669a1ad2fde3..9bbafc93aa9ca25afa5308fe2d171c7f2a0158c3 100644 (file)
--- a/configs/autoconf.in
+++ b/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/configs/bluegene-osmesa b/configs/bluegene-osmesa
index 88511109dadc96d4fc31544a0d3e9f3f6ba0c917..3fa0a04831c6f9997a3ec9880f78cbdfd4c6d2f4 100644 (file)
--- a/configs/bluegene-osmesa
+++ b/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/configs/bluegene-xlc-osmesa b/configs/bluegene-xlc-osmesa
index 292199a611c05c699bc511a8bbbaed1d8b14aa17..262b9734e05590e3573187c9d0d9645b7655acac 100644 (file)
--- a/configs/bluegene-xlc-osmesa
+++ b/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/configs/catamount-osmesa-pgi b/configs/catamount-osmesa-pgi
index 74fd53ab8bead2f2e9c04ed1684e7173f21da8c6..d660de3f8c8dbe829913292138e3323fc6b9ae07 100644 (file)
--- a/configs/catamount-osmesa-pgi
+++ b/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/configs/darwin b/configs/darwin
index 83f417ce0fd541b658e861f383bc57abc5051bfd..98cd457a014488ead39c0ae7f976440950da8d09 100644 (file)
--- a/configs/darwin
+++ b/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/configs/default b/configs/default
index 078c85e8b4d4873ffbd71b261d67cc8ba2b0f993..43666110b393defebd42b22c61b64159117c820b 100644 (file)
--- a/configs/default
+++ b/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/configs/freebsd b/configs/freebsd
index 00d46be882f3c70cc33fa1bf590395aa75ffbd93..70b0e03e947ab2609f296ab7634f18cb99c8f094 100644 (file)
--- a/configs/freebsd
+++ b/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/configs/hpux10 b/configs/hpux10
index 9ec08c0bb53cd73296aa49761394c690b2d30de4..fff27404692eb85d3dcdd82b78d9875ba6fda7a2 100644 (file)
--- a/configs/hpux10
+++ b/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/configs/hpux10-gcc b/configs/hpux10-gcc
index 40f243c2338b57fe474e51811b885982d7b159f9..cd38fa23aff4879828ef901c55c523260663a6a8 100644 (file)
--- a/configs/hpux10-gcc
+++ b/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/configs/hpux10-static b/configs/hpux10-static
index 18847d92701ec257e0e2608c0221aee20fa187b9..82f480c0627dc17fd1b223e07ea2fcca62ceb6cd 100644 (file)
--- a/configs/hpux10-static
+++ b/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/configs/hpux11-32 b/configs/hpux11-32
index d783ae0219c2b8476ae376f03fee6d1d761a42da..41888f39eb9088aed8e07011c8b7a172dd8acddb 100644 (file)
--- a/configs/hpux11-32
+++ b/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/configs/hpux11-32-static b/configs/hpux11-32-static
index 58a1c638f1278942f0c2137c4d571b47917f2b94..40352fb7def96f363b21da3030758eb3775af5c8 100644 (file)
--- a/configs/hpux11-32-static
+++ b/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/configs/hpux11-32-static-nothreads b/configs/hpux11-32-static-nothreads
index fa3d4c2d7b6ea0f2b3a8ac7511a41d8ef7cdf3c7..a2a8eda4671518bf886738a94256d0922f9f16d1 100644 (file)
--- a/configs/hpux11-32-static-nothreads
+++ b/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/configs/hpux11-64 b/configs/hpux11-64
index 0f963e2e50e437cf3603c1cbf46346b7600cafb0..0e5ef56bbdb3d2b7b122af85f0607542c33e907b 100644 (file)
--- a/configs/hpux11-64
+++ b/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/configs/hpux11-64-static b/configs/hpux11-64-static
index 4161d535fd4a8327cb5d14c75aa68d8f28094d1b..787f92799494c2a1966b364846e4c11759f3ddfe 100644 (file)
--- a/configs/hpux11-64-static
+++ b/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/configs/hpux11-ia64-static b/configs/hpux11-ia64-static
index de24a15146ea4a2da858d60ab729e4fa23c05ca1..cadb122391fc96051ddb1618eb1676b3dd84577c 100644 (file)
--- a/configs/hpux11-ia64-static
+++ b/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/configs/hpux9 b/configs/hpux9
index d0105e5c83d4f5384c10c5963950b0110a94e2fe..c37c2005efc1fcdd5e6f0a9c03b9aaa71ad45d2a 100644 (file)
--- a/configs/hpux9
+++ b/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/configs/hpux9-gcc b/configs/hpux9-gcc
index df30420565c1da18b31b1e79c63c0f41c2718968..e7fe6847b934a48c3f3152804b82d0499f91888c 100644 (file)
--- a/configs/hpux9-gcc
+++ b/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/configs/irix6-64 b/configs/irix6-64
index aae6d78eaed0f888f7ee66542aa783bdb6c52dd7..c2e6216ea1ba090071c5321ea01e979987649850 100644 (file)
--- a/configs/irix6-64
+++ b/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/configs/irix6-64-static b/configs/irix6-64-static
index e61f6247b1d61346929ed3b7401c8dddfe8c278d..9a22f4e11cf6c75dc4dd3a2330337d8ebe5b6525 100644 (file)
--- a/configs/irix6-64-static
+++ b/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/configs/irix6-n32 b/configs/irix6-n32
index 8a7817343f1f7a3a379f6713cccca23db177bc35..b0253754842f466b878b86d886909f6281762103 100644 (file)
--- a/configs/irix6-n32
+++ b/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/configs/irix6-n32-static b/configs/irix6-n32-static
index 47b5e50671832d85707f2222f66d1e4cc30cc47f..83eb5c0c06267e8569b6ba810490f312d460455e 100644 (file)
--- a/configs/irix6-n32-static
+++ b/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/configs/irix6-o32 b/configs/irix6-o32
index 1e4c8c53ea43ab5a6bdc15ac2a2febd7a946126d..ab50953edc9b9c208cf38e22586abded457231fc 100644 (file)
--- a/configs/irix6-o32
+++ b/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/configs/irix6-o32-static b/configs/irix6-o32-static
index 58fbe4e8e4f0b6bcf6d797c4c4f23ee17f95b53a..2e62c1b56336dbb39cd308320459b8ab5e05287f 100644 (file)
--- a/configs/irix6-o32-static
+++ b/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/configs/linux-alpha b/configs/linux-alpha
index 803873979543157415e50b2bb1612147ce503c1f..f80c972bb182b76214e9905b4f54e57bfed4c339 100644 (file)
--- a/configs/linux-alpha
+++ b/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/configs/linux-alpha-static b/configs/linux-alpha-static
index 33938e85be61576a2d9bb65a303ffcf9dd41ac45..8b2265cb16734dd67282a76dcaca8d54ee9d46e0 100644 (file)
--- a/configs/linux-alpha-static
+++ b/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/configs/linux-ia64-icc b/configs/linux-ia64-icc
index 1594256c55196e474578ad23debd0a754c9e8a43..8bd90cca22ebfbc07dfdd913efb08ccfa02b62da 100644 (file)
--- a/configs/linux-ia64-icc
+++ b/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/configs/linux-ia64-icc-static b/configs/linux-ia64-icc-static
index b5c33a525a265a649a10673734304ce530aa68a8..f926fb3d92b2e250949c3f9ac2441f6e1d87c7cf 100644 (file)
--- a/configs/linux-ia64-icc-static
+++ b/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/configs/linux-icc b/configs/linux-icc
index 2cfb2025f4d0db2403f457bde695805b3b56aa15..9d164250c1c1bf47d90cc62ef4403fd21aaec2f7 100644 (file)
--- a/configs/linux-icc
+++ b/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/configs/linux-icc-static b/configs/linux-icc-static
index d0311962a9c01a7ccbbca7f303651e24436ef83c..b9c09d4a19c1a9ff0ae4df5597677348a00d1a1a 100644 (file)
--- a/configs/linux-icc-static
+++ b/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/configs/linux-osmesa b/configs/linux-osmesa
index 4cc5e51f16d0b24b8180b369f1a55f47df10dc0d..5d7ab463fd41b77069b39cef272e451a0f656e4b 100644 (file)
--- a/configs/linux-osmesa
+++ b/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/configs/linux-osmesa-static b/configs/linux-osmesa-static
index d3af7a9d3ad5cbdbc8607751ffaaf0e0e40dd60c..00154900a875e39aa97099bcafa02fbdeca32baf 100644 (file)
--- a/configs/linux-osmesa-static
+++ b/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/configs/linux-osmesa16 b/configs/linux-osmesa16
index e6c26a2863094a57c2924015b4dd05294d38eede..c424214fe3507dec3fe3952dd59cbfc5bd1a3fad 100644 (file)
--- a/configs/linux-osmesa16
+++ b/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/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
index a6c0cab1b8d01a47adf73dd76714035431ad47c7..50ae18321f7645929dcac6b40dc2d89d358f3b92 100644 (file)
--- a/configs/linux-osmesa16-static
+++ b/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/configs/linux-osmesa32 b/configs/linux-osmesa32
index dafa31b2e419131de410471325c2a135eabafce7..6602c325e3a70852e4bd4402575ddc3de85763fb 100644 (file)
--- a/configs/linux-osmesa32
+++ b/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/configs/linux-static b/configs/linux-static
index 2b97daad8754f94645a0f4ffec7c1f079626050d..8a8db6edc736296b720ca0abfa1d1895fb5d01af 100644 (file)
--- a/configs/linux-static
+++ b/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/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 89a0e3e03f09fcaaf3d03e14c42c79dbafb047cb..dfb136f92abae74a51cfbf4f2ceb58adc80bba8d 100644 (file)
--- a/configs/linux-x86-64-static
+++ b/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/configs/linux-x86-static b/configs/linux-x86-static
index dba6299e47272a24fc7cf4e6a3fdd729d1753df7..19151d20330db8e1ab52ac94f7fdc043f1302cd4 100644 (file)
--- a/configs/linux-x86-static
+++ b/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/configs/netbsd b/configs/netbsd
index c65e90199fa2f3bbbc8d0f6363c82f1a004b077c..e74ca632e79f8c0bdbaab9d3e49f3171445ccbb5 100644 (file)
--- a/configs/netbsd
+++ b/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/configs/openbsd b/configs/openbsd
index 982675fa2295eb3efaee4d14792e10d6701b60c4..259da0b08faad8840036cb8a852b96b640745132 100644 (file)
--- a/configs/openbsd
+++ b/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/configs/osf1 b/configs/osf1
index 5a2e1f2ecc82922376404cea0cc66cbe3cc6d95c..782f483c00a6cf29e575a0e2f8035564caab127f 100644 (file)
--- a/configs/osf1
+++ b/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/configs/osf1-static b/configs/osf1-static
index f20005da10b3a624b19afa6aee7d75c228a60721..ccc97ac38c9967f6ed33bd32063e41526f32313e 100644 (file)
--- a/configs/osf1-static
+++ b/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/configs/solaris-x86 b/configs/solaris-x86
index 3c64d35a104270585276c178e11577efeaa0d047..2975f57527ec21952b86b9a70b62fcd1290d0abe 100644 (file)
--- a/configs/solaris-x86
+++ b/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/configs/solaris-x86-gcc b/configs/solaris-x86-gcc
index 065ce369f4a0b3ad5ee17f750957819203b99adf..baa30648207a5b602657b65a066c951a93d5550b 100644 (file)
--- a/configs/solaris-x86-gcc
+++ b/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/configs/solaris-x86-gcc-static b/configs/solaris-x86-gcc-static
index dd12084b75345923587be9338f39487e95f71021..9d2aa52c5512abc35946d7b086a3eef968bff2f1 100644 (file)
--- a/configs/solaris-x86-gcc-static
+++ b/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/configs/sunos4 b/configs/sunos4
index 9e6627dc0939eabe511747ebcdfc42c8b5efa01c..f8f1e7532e9cb523fe9ddaabbb5feeea36238082 100644 (file)
--- a/configs/sunos4
+++ b/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/configs/sunos4-gcc b/configs/sunos4-gcc
index 85439c93bfb26a13f96fb8e1800c92062c1bcf5a..36a75497a06a042026fbbf005cc6f4996a4f68ca 100644 (file)
--- a/configs/sunos4-gcc
+++ b/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/configs/sunos4-static b/configs/sunos4-static
index b05184d46bf3d8ce5df6e9dbac46c4e151f447c5..4432bfd7154a93ab753c7a2f24e95a253dfa2fb4 100644 (file)
--- a/configs/sunos4-static
+++ b/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/configs/sunos5 b/configs/sunos5
index b3d3fc6ede152c821bcd274f5466c038ff11bbce..3632dabf6978a76743a0d9739b9ab0df537102c6 100644 (file)
--- a/configs/sunos5
+++ b/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/configs/sunos5-gcc b/configs/sunos5-gcc
index e4d34036365f089c1394dc02d495ae221dd01863..f9c1dfab51e446792dc4be035ddf81e1307aca43 100644 (file)
--- a/configs/sunos5-gcc
+++ b/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/configs/sunos5-smp b/configs/sunos5-smp
index 93132b64304d1c3b1b04c371cdc3838f19d3f40b..2d3e1026e5ae44ccdbd765692707d9ab832d9018 100644 (file)
--- a/configs/sunos5-smp
+++ b/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/configs/sunos5-v8 b/configs/sunos5-v8
index 19ff67b15969360cb5313b60625558b8a9a4425b..5a7be86e147bf5b6e51704382dba60698ce3cc12 100644 (file)
--- a/configs/sunos5-v8
+++ b/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/configs/sunos5-v8-static b/configs/sunos5-v8-static
index edb3227c5fea53b558181b32137275331d3592ed..b3b182d17401dc02d31494827502d2ab7771d9c5 100644 (file)
--- a/configs/sunos5-v8-static
+++ b/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/configs/sunos5-v9 b/configs/sunos5-v9
index 28b402ee19e51a41aba2ef6adc0dd228200e4ea2..6ebe0ee494dff1d7f69f41370a33facdc468cae5 100644 (file)
--- a/configs/sunos5-v9
+++ b/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/configs/sunos5-v9-cc-g++ b/configs/sunos5-v9-cc-g++
index a303f891da34c1645b46e5b56e81bcc358c88c60..a9e9bd3e976e3210a40d6a0180a50ff917ea3cc3 100644 (file)
--- a/configs/sunos5-v9-cc-g++
+++ b/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/configs/sunos5-v9-static b/configs/sunos5-v9-static
index ccf5eb3ce08807eba29740920b36949dc88c891f..b2da747b8a528f4fa25e13e0180195edaf498828 100644 (file)
--- a/configs/sunos5-v9-static
+++ b/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/configs/ultrix-gcc b/configs/ultrix-gcc
index 4414e7acd862bf209cd5331b13a6e8e18566fc0c..d38260060be29447c2ce0ae828e461a17f75a9ae 100644 (file)
--- a/configs/ultrix-gcc
+++ b/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

diff --git a/configure.ac b/configure.ac
index 9916a06a92f5574fcfaa3c19ab17c7c842b21f8d..a686a11aa195941c315b66666a61ec7adb3550df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -949,13 +949,6 @@ xyesyes)
     fi
     GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS"
     GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
-
-    # if static, move the external libraries to the programs
-    # and empty the libraries for libGL
-    if test "$enable_static" = yes; then
-        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"
-        GL_LIB_DEPS=""
-    fi
     ;;
 xyesno)
     # DRI-based GLX
@@ -1578,7 +1571,6 @@ if test "x$enable_glu" = xyes; then
         else
             GLU_LIB_DEPS=""
             GLU_MESA_DEPS=""
-            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"
         fi
     fi
 fi
@@ -1593,25 +1585,6 @@ AC_SUBST([GLU_PC_REQ_PRIV])
 AC_SUBST([GLU_PC_LIB_PRIV])
 AC_SUBST([GLU_PC_CFLAGS])
 
-dnl
-dnl Program library dependencies
-dnl    Only libm is added here if necessary as the libraries should
-dnl    be pulled in by the linker
-dnl
-if test "x$APP_LIB_DEPS" = x; then
-    case "$host_os" in
-    solaris*)
-        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"
-        ;;
-    cygwin*)
-        APP_LIB_DEPS="-lX11"
-        ;;
-    *)
-        APP_LIB_DEPS="-lm"
-        ;;
-    esac
-fi
-AC_SUBST([APP_LIB_DEPS])
 AC_SUBST([PROGRAM_DIRS])
 
 dnl