diff options
| author | Brad King <[email protected]> | 2012-07-16 09:10:02 -0400 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2012-07-23 22:34:13 -0700 |
| commit | 27382c0f7ba2ae826531ba4c254741b2a9df1882 (patch) | |
| tree | 2eef342c2e691777c737390d8cec00fab5832a36 /src/mesa/drivers | |
| 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 <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/x11/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index 52febbb8d1b..726a9c66936 100644 --- a/src/mesa/drivers/x11/Makefile.am +++ b/src/mesa/drivers/x11/Makefile.am @@ -33,10 +33,10 @@ AM_CPPFLAGS = \ $(DEFINES) if HAVE_X11_DRIVER -lib_LTLIBRARIES = libGL.la +lib_LTLIBRARIES = lib@[email protected] endif -libGL_la_SOURCES = \ +lib@GL_LIB@_la_SOURCES = \ glxapi.h \ glxheader.h \ xfonts.h \ @@ -55,20 +55,20 @@ GL_MAJOR = 1 GL_MINOR = 6 GL_PATCH = 0 -libGL_la_LIBADD = \ +lib@GL_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.la -libGL_la_LDFLAGS = \ +lib@GL_LIB@_la_LDFLAGS = \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ $(GL_LIB_DEPS) if HAVE_SHARED_GLAPI -libGL_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB) +lib@GL_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB) endif # 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. -all-local: libGL.la +all-local: lib@[email protected] $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/libGL.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/libGL.so.1 - ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so + ln -f .libs/lib@[email protected].$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@[email protected].$(GL_MAJOR) + ln -sf lib@[email protected].$(GL_MAJOR) $(top_builddir)/$(LIB_DIR)/lib@[email protected] |