Mesa (7.8): Add -L$(libdir) for xdemos and egl so that the right libX11 is found

[Brian Paul]

Module: Mesa
Branch: 7.8
Commit: 978706042317edd9fde90e613cc73d87ddd7d7b8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=978706042317edd9fde90e613cc73d87ddd7d7b8

Author: Jeff Smith <whydoubt at yahoo.com>
Date:   Tue Mar  9 12:40:44 2010 -0600

Add -L$(libdir) for xdemos and egl so that the right libX11 is found

Signed-off-by: Jeff Smith <whydoubt at yahoo.com>
Signed-off-by: Brian Paul <brianp at vmware.com>

---

 progs/egl/Makefile    |    6 +++---
 progs/xdemos/Makefile |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/progs/egl/Makefile b/progs/egl/Makefile
index c003cf3..25de6e1 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 9cf984b..e87d55d 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 \