diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-03-02 20:06:38 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-03-11 12:50:43 +0000 |
| commit | 020bc0d0dd2e71dd32d6e16e3c18acd79c328b0b (patch) | |
| tree | ecd1729b8b4bd2fd9015d346fb8398474d36827e /src | |
| parent | 3c5599b276902fce52752e0f20a0dc52b7ec2aff (diff) | |
| download | external_mesa3d-020bc0d0dd2e71dd32d6e16e3c18acd79c328b0b.zip external_mesa3d-020bc0d0dd2e71dd32d6e16e3c18acd79c328b0b.tar.gz external_mesa3d-020bc0d0dd2e71dd32d6e16e3c18acd79c328b0b.tar.bz2 | |
automake: do not use symbols names for static glapi.la
In the cases where one links against the static glapi.la there
is no need to create temporary variables only to explicitly
link agaist it.
Instead use SHARED_GLAPI_LIB to explicitly indicate when one
is building and linking with the shared glapi provider.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/osmesa/Makefile.am | 8 | ||||
| -rw-r--r-- | src/glx/Makefile.am | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 6 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index beb9bba..66ddf93 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -40,9 +40,8 @@ lib@OSMESA_LIB@_la_SOURCES = target.c lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined -GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la if HAVE_SHARED_GLAPI -GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la +SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif lib@OSMESA_LIB@_la_LIBADD = \ @@ -51,8 +50,9 @@ lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ - $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ - $(GLAPI_LIB) \ + $(top_builddir)/src/gallium/state_trackers/osmesa/libosmesa.la \ + $(top_builddir)/src/mapi/glapi/libglapi.la \ + $(SHARED_GLAPI_LIB) \ $(OSMESA_LIB_DEPS) \ $(CLOCK_LIB) diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index c8dfb86..eb20240 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -21,13 +21,11 @@ if HAVE_SHARED_GLAPI SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI -SHARED_GLAPI_LIBS = $(top_builddir)/src/mapi/shared-glapi/libglapi.la +SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif SUBDIRS=. tests -GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la - if HAVE_XF86VIDMODE EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE endif @@ -106,8 +104,8 @@ libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la GL_LIBS = \ libglx.la \ - $(SHARED_GLAPI_LIBS) \ - $(GLAPI_LIB) \ + $(top_builddir)/src/mapi/glapi/libglapi.la \ + $(SHARED_GLAPI_LIB) \ $(GL_LIB_DEPS) GL_LDFLAGS = \ diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 2fdd6fd..e18b735 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -37,14 +37,14 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined -GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la if HAVE_SHARED_GLAPI -GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la +SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ - $(GLAPI_LIB) \ + $(top_builddir)/src/mapi/glapi/libglapi.la \ + $(SHARED_GLAPI_LIB) \ $(OSMESA_LIB_DEPS) if BUILD_SHARED |