diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-03-15 20:53:56 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-03-23 13:26:50 -0700 |
| commit | e725ef171b5a4d5425461f237d9ccab223806913 (patch) | |
| tree | eaadc7d655afd1cbd445ef58e549b72b74fe61fe /progs/xdemos | |
| parent | ba5a53edd12fac24c176e714560b1f9ec255bbdb (diff) | |
Change libX11 variables to not conflict with AC_PATH_XTRA
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index f81aafe00f..660c540657 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -9,7 +9,7 @@ INCDIR = $(TOP)/include LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Add X11 and pthread libs to satisfy GNU gold. -APP_LIB_DEPS += $(X_LIBS) -lpthread +APP_LIB_DEPS += $(X11_LIBS) -lpthread LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) |