From f1efacb92b4c7e52f5f060a655a2dacfdddac44b Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Wed, 5 Dec 2007 20:34:59 -0800 Subject: [PATCH] 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. --- configs/linux-osmesa | 2 +- configs/linux-osmesa16 | 2 +- configs/linux-osmesa16-static | 2 +- configs/linux-osmesa32 | 2 +- progs/osdemos/Makefile | 14 +++++++++----- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/configs/linux-osmesa b/configs/linux-osmesa index 163b145..504980b 100644 --- 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 796fba1..e8eaa83 100644 --- 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 0e0d151..8ce674f 100644 --- 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 12d0cb0..6d37f5c 100644 --- 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 148d603..023ea02 100644 --- 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 \ -- 2.7.4