summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorJeff Smith <whydoubt@yahoo.com>2010-03-09 12:40:44 -0600
committerBrian Paul <brianp@vmware.com>2010-03-12 08:56:06 -0700
commit978706042317edd9fde90e613cc73d87ddd7d7b8 (patch)
tree23ed34ce9f339603c0d9d60de25d313453735345 /progs
parentfab1f07d6ad01463897ae792f4b33738afb07369 (diff)
Add -L$(libdir) for xdemos and egl so that the right libX11 is found
Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'progs')
-rw-r--r--progs/egl/Makefile6
-rw-r--r--progs/xdemos/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index c003cf3cc5..25de6e1f70 100644
--- a/progs/egl/Makefile
+++ b/progs/egl/Makefile
@@ -57,13 +57,13 @@ peglgears: peglgears.o $(HEADERS) $(LIB_DEP)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(LIBDRM_LIB) -lm
xeglgears: xeglgears.o $(HEADERS) $(LIB_DEP)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11 -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm -L$(libdir) -lX11
xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11 -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm -L$(libdir) -lX11
xegl_tri: xegl_tri.o $(HEADERS) $(LIB_DEP)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lX11
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm -L$(libdir) -lX11
clean:
-rm -f *.o *~
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index 9cf984b59e..e87d55d011 100644
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
# Add X11 and pthread libs to satisfy GNU gold.
APP_LIB_DEPS += -lX11 -lpthread
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS)
PROGS = \
corender \