Make osdemos linking like other programs

Most of the programs list their dependencies on the Mesa libraries in
their Makefiles. This works with the default configuration where
APP_LIB_DEPS only lists external libraries. This changes the
linux-osmesa configs and the osdemos Makefile to follow that convention.

Some cleanup of the Makefile is also added to refer to the GL libraries
through the existing variables rather than hardcoding their names.

diff --git a/configs/linux-osmesa b/configs/linux-osmesa
index 163b1452910d2613f2ac09af68ee3a01becf8894..504980b22d7bb4f919db027764940892410f9396 100644 (file)
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -25,4 +25,4 @@ PROGRAM_DIRS = osdemos
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa -lGLU
+APP_LIB_DEPS = -lm -lpthread

diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
index 796fba17806e372928f887079d6da0ac53833632..e8eaa832366170441c8614e04fb134499be23b0c 100644 (file)
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -28,4 +28,4 @@ PROGRAM_DIRS =
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa16
+APP_LIB_DEPS = -lm -lpthread

diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
index 0e0d1519f39766add2559a43e60e1e910ac986b1..8ce674f3f97015d6552616cbc7a5aefeb3d147ea 100644 (file)
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -29,4 +29,4 @@ PROGRAM_DIRS =
 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa16
+APP_LIB_DEPS = -lm -lpthread

diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
index 12d0cb053d087c9c76d61683d2e80894e468b167..6d37f5ce6f115ec7bc9070f39387cd3a6e27c8f4 100644 (file)
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -28,4 +28,4 @@ PROGRAM_DIRS =
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-APP_LIB_DEPS = -lOSMesa32
+APP_LIB_DEPS = -lm -lpthread

diff --git a/progs/osdemos/Makefile b/progs/osdemos/Makefile
index 148d603b35334d364ebb11b361281eb409cfbc57..023ea02ae27021abbf97d81fda0556ac8d73beb9 100644 (file)
--- a/progs/osdemos/Makefile
+++ b/progs/osdemos/Makefile
@@ -5,15 +5,19 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(OSMESA_LIB) $(APP_LIB_DEPS)
 
-OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa16 -l$(GLU_LIB) \
+       -l$(GL_LIB) $(APP_LIB_DEPS)
 
-OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa32 -l$(GLU_LIB) \
+       -l$(GL_LIB) $(APP_LIB_DEPS)
 
-LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
+       $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
 
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+       $(APP_LIB_DEPS)
 
 PROGS = \
        osdemo \