diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/glx/Makefile.am | 27 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/Makefile.am | 16 |
3 files changed, 15 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index a7f1de3..833a940 100644 --- a/configure.ac +++ b/configure.ac @@ -389,7 +389,6 @@ fi AC_SUBST([GL_LIB]) AC_SUBST([GLU_LIB]) AC_SUBST([OSMESA_LIB]) -AM_CONDITIONAL(HAVE_MANGLED_GL, test "x${enable_mangling}" = "xyes") dnl dnl potentially-infringing-but-nobody-knows-for-sure stuff diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index bb23998..aa3d8ed 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 diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index 52febbb..726a9c6 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@GL_LIB@.la 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@GL_LIB@.la $(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@GL_LIB@.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.$(GL_MAJOR) + ln -sf lib@GL_LIB@.so.$(GL_MAJOR) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so |