diff options
Diffstat (limited to 'lib/mesa/src/glx/Makefile.in')
| -rw-r--r-- | lib/mesa/src/glx/Makefile.in | 66 |
1 files changed, 36 insertions, 30 deletions
diff --git a/lib/mesa/src/glx/Makefile.in b/lib/mesa/src/glx/Makefile.in index 37ed64363..5573174d8 100644 --- a/lib/mesa/src/glx/Makefile.in +++ b/lib/mesa/src/glx/Makefile.in @@ -115,19 +115,19 @@ target_triplet = @target@ @HAVE_WINDOWSDRI_TRUE@ $(builddir)/windows/libwindowsdri.la \ @HAVE_WINDOWSDRI_TRUE@ $(builddir)/windows/libwindowsglx.la -@USE_LIBGLVND_TRUE@am__append_12 = \ -@USE_LIBGLVND_TRUE@ -DGL_LIB_NAME=\"lib@GL_LIB@.so\" \ -@USE_LIBGLVND_TRUE@ $(GLVND_CFLAGS) +@USE_LIBGLVND_GLX_TRUE@am__append_12 = \ +@USE_LIBGLVND_GLX_TRUE@ -DGL_LIB_NAME=\"lib@GL_LIB@.so\" \ +@USE_LIBGLVND_GLX_TRUE@ $(GLVND_CFLAGS) -@USE_LIBGLVND_TRUE@am__append_13 = \ -@USE_LIBGLVND_TRUE@ g_glxglvnddispatchfuncs.c \ -@USE_LIBGLVND_TRUE@ g_glxglvnddispatchindices.h \ -@USE_LIBGLVND_TRUE@ glxglvnd.c \ -@USE_LIBGLVND_TRUE@ glxglvnd.h \ -@USE_LIBGLVND_TRUE@ glxglvnddispatchfuncs.h +@USE_LIBGLVND_GLX_TRUE@am__append_13 = \ +@USE_LIBGLVND_GLX_TRUE@ g_glxglvnddispatchfuncs.c \ +@USE_LIBGLVND_GLX_TRUE@ g_glxglvnddispatchindices.h \ +@USE_LIBGLVND_GLX_TRUE@ glxglvnd.c \ +@USE_LIBGLVND_GLX_TRUE@ glxglvnd.h \ +@USE_LIBGLVND_GLX_TRUE@ glxglvnddispatchfuncs.h -@USE_LIBGLVND_FALSE@am__append_14 = \ -@USE_LIBGLVND_FALSE@ -DGL_LIB_NAME=\"lib@GL_LIB@.so.1\" +@USE_LIBGLVND_GLX_FALSE@am__append_14 = \ +@USE_LIBGLVND_GLX_FALSE@ -DGL_LIB_NAME=\"lib@GL_LIB@.so.1\" @HAVE_WINDOWSDRI_TRUE@am__append_15 = -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -179,7 +179,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) libglx.la \ +am__DEPENDENCIES_2 = libglx.la \ $(top_builddir)/src/mapi/glapi/libglapi.la $(SHARED_GLAPI_LIB) \ $(am__DEPENDENCIES_1) lib@GL_LIB@_la_DEPENDENCIES = $(am__DEPENDENCIES_2) @@ -222,8 +222,8 @@ am__libglx_la_SOURCES_DIST = clientattrib.c clientinfo.c compsize.c \ @HAVE_DRI3_TRUE@am__objects_4 = dri3_glx.lo @HAVE_APPLEDRI_TRUE@am__objects_5 = applegl_glx.lo @HAVE_WINDOWSDRI_TRUE@am__objects_6 = driwindows_glx.lo -@USE_LIBGLVND_TRUE@am__objects_7 = g_glxglvnddispatchfuncs.lo \ -@USE_LIBGLVND_TRUE@ glxglvnd.lo +@USE_LIBGLVND_GLX_TRUE@am__objects_7 = g_glxglvnddispatchfuncs.lo \ +@USE_LIBGLVND_GLX_TRUE@ glxglvnd.lo am_libglx_la_OBJECTS = clientattrib.lo clientinfo.lo compsize.lo \ create_context.lo eval.lo glxcmds.lo glxconfig.lo \ glxcurrent.lo glx_error.lo glxext.lo glxextensions.lo \ @@ -324,8 +324,6 @@ AMDGPU_CFLAGS = @AMDGPU_CFLAGS@ AMDGPU_LIBS = @AMDGPU_LIBS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -ANDROID_CFLAGS = @ANDROID_CFLAGS@ -ANDROID_LIBS = @ANDROID_LIBS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -356,6 +354,8 @@ DLLTOOL = @DLLTOOL@ DLOPEN_LIBS = @DLOPEN_LIBS@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ DRI2PROTO_LIBS = @DRI2PROTO_LIBS@ +DRI3PROTO_CFLAGS = @DRI3PROTO_CFLAGS@ +DRI3PROTO_LIBS = @DRI3PROTO_LIBS@ DRIGL_CFLAGS = @DRIGL_CFLAGS@ DRIGL_LIBS = @DRIGL_LIBS@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@ @@ -368,11 +368,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGL_CFLAGS = @EGL_CFLAGS@ +EGL_CLIENT_APIS = @EGL_CLIENT_APIS@ EGL_LIB_DEPS = @EGL_LIB_DEPS@ EGL_NATIVE_PLATFORM = @EGL_NATIVE_PLATFORM@ EGREP = @EGREP@ -ETNAVIV_CFLAGS = @ETNAVIV_CFLAGS@ -ETNAVIV_LIBS = @ETNAVIV_LIBS@ EXEEXT = @EXEEXT@ EXPAT_CFLAGS = @EXPAT_CFLAGS@ EXPAT_LIBS = @EXPAT_LIBS@ @@ -420,27 +419,31 @@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIBS = @LIBDRM_LIBS@ LIBELF_CFLAGS = @LIBELF_CFLAGS@ LIBELF_LIBS = @LIBELF_LIBS@ -LIBGLVND_DATADIR = @LIBGLVND_DATADIR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBSENSORS_LIBS = @LIBSENSORS_LIBS@ +LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@ +LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@ +LIBSHA1_LIBS = @LIBSHA1_LIBS@ LIBTOOL = @LIBTOOL@ -LIBUNWIND_CFLAGS = @LIBUNWIND_CFLAGS@ -LIBUNWIND_LIBS = @LIBUNWIND_LIBS@ LIB_DIR = @LIB_DIR@ LIB_EXT = @LIB_EXT@ LIPO = @LIPO@ +LLVM_BINDIR = @LLVM_BINDIR@ LLVM_CFLAGS = @LLVM_CFLAGS@ LLVM_CONFIG = @LLVM_CONFIG@ +LLVM_CPPFLAGS = @LLVM_CPPFLAGS@ LLVM_CXXFLAGS = @LLVM_CXXFLAGS@ LLVM_INCLUDEDIR = @LLVM_INCLUDEDIR@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ +LLVM_LIBDIR = @LLVM_LIBDIR@ LLVM_LIBS = @LLVM_LIBS@ +LLVM_VERSION = @LLVM_VERSION@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MESA_LLVM = @MESA_LLVM@ MKDIR_P = @MKDIR_P@ MSVC2013_COMPAT_CFLAGS = @MSVC2013_COMPAT_CFLAGS@ MSVC2013_COMPAT_CXXFLAGS = @MSVC2013_COMPAT_CXXFLAGS@ @@ -461,6 +464,8 @@ OMX_LIBS = @OMX_LIBS@ OMX_LIB_INSTALL_DIR = @OMX_LIB_INSTALL_DIR@ OPENCL_LIBNAME = @OPENCL_LIBNAME@ OPENCL_VERSION = @OPENCL_VERSION@ +OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ +OPENSSL_LIBS = @OPENSSL_LIBS@ OSMESA_LIB = @OSMESA_LIB@ OSMESA_LIB_DEPS = @OSMESA_LIB_DEPS@ OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@ @@ -480,6 +485,8 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSIX_SHELL = @POSIX_SHELL@ +PRESENTPROTO_CFLAGS = @PRESENTPROTO_CFLAGS@ +PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@ PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@ PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@ PTHREAD_CC = @PTHREAD_CC@ @@ -495,6 +502,8 @@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ +SHA1_CFLAGS = @SHA1_CFLAGS@ +SHA1_LIBS = @SHA1_LIBS@ SHELL = @SHELL@ SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@ SIMPENROSE_LIBS = @SIMPENROSE_LIBS@ @@ -503,6 +512,7 @@ STRIP = @STRIP@ SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@ SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@ SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@ +TIMESTAMP_CMD = @TIMESTAMP_CMD@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ VALGRIND_LIBS = @VALGRIND_LIBS@ VA_CFLAGS = @VA_CFLAGS@ @@ -518,6 +528,7 @@ VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@ VDPAU_MAJOR = @VDPAU_MAJOR@ VDPAU_MINOR = @VDPAU_MINOR@ VERSION = @VERSION@ +VG_LIB_DEPS = @VG_LIB_DEPS@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@ VL_CFLAGS = @VL_CFLAGS@ @@ -546,10 +557,9 @@ XVMC_LIBS = @XVMC_LIBS@ XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@ XVMC_MAJOR = @XVMC_MAJOR@ XVMC_MINOR = @XVMC_MINOR@ +XXD = @XXD@ YACC = @YACC@ YFLAGS = @YFLAGS@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -643,13 +653,9 @@ libglx_la_SOURCES = clientattrib.c clientinfo.c compsize.c \ $(am__append_9) $(am__append_13) libglx_la_LIBADD = $(top_builddir)/src/loader/libloader.la \ $(am__append_5) $(am__append_8) $(am__append_11) -@USE_LIBGLVND_FALSE@GL_LIB_VERSION = 1:2 -@USE_LIBGLVND_TRUE@GL_LIB_VERSION = 0 - -# Push the libdrm furhter up, as due to libtool bug we might end up relinking -# against the system one. +@USE_LIBGLVND_GLX_FALSE@GL_LIB_VERSION = 1:2 +@USE_LIBGLVND_GLX_TRUE@GL_LIB_VERSION = 0 GL_LIBS = \ - $(LIBDRM_LIBS) \ libglx.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ $(SHARED_GLAPI_LIB) \ |