diff options
| author | Brad King <brad.king@kitware.com> | 2012-07-16 09:10:02 -0400 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-07-23 22:34:13 -0700 |
| commit | 27382c0f7ba2ae826531ba4c254741b2a9df1882 (patch) | |
| tree | 2eef342c2e691777c737390d8cec00fab5832a36 /src/glx/Makefile.am | |
| parent | 82fc813ca870c4002502e098519bead7bec1a7e8 (diff) | |
automake: Honor GL_LIB for mangled/custom lib names
Commit 2d4b77c7 (automake: Convert src/mesa/drivers/x11/Makefile to
automake, 2012-06-12) dropped the old Makefile, which used GL_LIB, and
replaced it with a Makefile.am hard-coding the name "GL". This broke
handling of --enable-mangling and --with-gl-lib-name options which
depend on GL_LIB to specify the GL library name.
Use "@GL_LIB@" in src/mesa/drivers/x11/Makefile.am to configure the
library name. Also use this approach to simplify src/glx/Makefile.am
and drop the HAVE_MANGLED_GL conditional. While at it, fix the
compatibility link we create in "lib" for the software-only driver to
use version GL_MAJOR instead of hard-coding "1".
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'src/glx/Makefile.am')
| -rw-r--r-- | src/glx/Makefile.am | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index bb23998811..aa3d8edf03 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -47,15 +47,7 @@ AM_CFLAGS = \ $(GLPROTO_CFLAGS) \ $(X11_INCLUDES) -if HAVE_MANGLED_GL -MANGLED_GL_LIB = libMangledGL.la -else -NORMAL_GL_LIB = libGL.la -endif - -lib_LTLIBRARIES = \ - $(NORMAL_GL_LIB) \ - $(MANGLED_GL_LIB) +lib_LTLIBRARIES = lib@GL_LIB@.la noinst_LTLIBRARIES = libglx.la @@ -109,21 +101,16 @@ GL_LDFLAGS = \ -Wl,-Bsymbolic \ -version-number 1:2 -no-undefined -libGL_la_SOURCES = -libMangledGL_la_SOURCES = -libGL_la_LIBADD = $(GL_LIBS) -libMangledGL_la_LIBADD = $(GL_LIBS) -libGL_la_LDFLAGS = $(GL_LDFLAGS) -libMangledGL_la_LDFLAGS = $(GL_LDFLAGS) +lib@GL_LIB@_la_SOURCES = +lib@GL_LIB@_la_LIBADD = $(GL_LIBS) +lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS) # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the driver into /lib of the build tree. -if !HAVE_MANGLED_GL -all-local: $(NORMAL_GL_LIB) $(MANGLED_GL_LIB) +all-local: lib@GL_LIB@.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libGL.so.1.2.0 $(top_builddir)/$(LIB_DIR)/libGL.so.1 - ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so -endif + ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1 + ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so $(GLAPI_LIB): @$(MAKE) -C $(TOP)/src/mapi/glapi |