summaryrefslogtreecommitdiff
path: root/progs/demos
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-05-09 16:19:03 -0700
committerDan Nicholson <dbn.lists@gmail.com>2008-05-09 16:19:50 -0700
commit738d811b04ab1c3f5315e7bf8b7d0bc553dea501 (patch)
tree15628feef4db8cdd1ea2216e778b47a3f88c6cec /progs/demos
parent2d709fe2721e6e7f8c33e2973e623fcf44b19efe (diff)
Don't link demos directly to X libraries
Since the linker will just pull in the libraries needed from libGL, we don't need to link the demos directly to the X libraries. Fixes #15886.
Diffstat (limited to 'progs/demos')
-rw-r--r--progs/demos/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 01b76ad105..7fde77f0b4 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -11,9 +11,11 @@ OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(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) -lX11 -lXi -lXmu
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+ $(APP_LIB_DEPS)
PROGS = \
arbfplight \