diff options
| author | Jeff Smith <[email protected]> | 2010-03-12 18:55:09 -0600 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2010-04-19 20:21:57 -0700 |
| commit | 3b693fd93fbddc24360ed345a832387834e0a1fc (patch) | |
| tree | 0f8544fc9e285d776bc264a3d7d0ea5566fe6504 /progs | |
| parent | 0a18cdb0ed2f4b747688f653d9947d174fae77ff (diff) | |
Use X_LIBS from pkg-config, instead of libdir, for locating libX11
Signed-off-by: Jeff Smith <[email protected]>
Signed-off-by: Dan Nicholson <[email protected]>
(cherry picked from commit 8d86d395dcf6a5f192b6987485bb7aef49f1fefc)
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/egl/Makefile | 6 | ||||
| -rw-r--r-- | progs/xdemos/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/progs/egl/Makefile b/progs/egl/Makefile index 25de6e1f703..5f51104fed6 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) -lm -L$(libdir) -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X_LIBS) xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm -L$(libdir) -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X_LIBS) xegl_tri: xegl_tri.o $(HEADERS) $(LIB_DEP) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm -L$(libdir) -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lm $(X_LIBS) clean: -rm -f *.o *~ diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index d81caab4dd3..038e21cf9ac 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -9,9 +9,9 @@ INCDIR = $(TOP)/include LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Add X11 and pthread libs to satisfy GNU gold. -APP_LIB_DEPS += -lX11 -lpthread +APP_LIB_DEPS += $(X_LIBS) -lpthread -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) PROGS = \ corender \ |