diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
commit | 051645c92924bf915d82bf219f2ed67309b5577a (patch) | |
tree | 4aae126dd8e5a18c6a9926a5468d1561e6038a07 /lib/mesa/src/Makefile.in | |
parent | 2dae6fe6f74cf7fb9fd65285302c0331d9786b00 (diff) |
Merge Mesa 17.2.8
Diffstat (limited to 'lib/mesa/src/Makefile.in')
-rw-r--r-- | lib/mesa/src/Makefile.in | 97 |
1 files changed, 37 insertions, 60 deletions
diff --git a/lib/mesa/src/Makefile.in b/lib/mesa/src/Makefile.in index ef2ede0b9..2632b2afe 100644 --- a/lib/mesa/src/Makefile.in +++ b/lib/mesa/src/Makefile.in @@ -74,21 +74,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@HAVE_AMD_DRIVERS_TRUE@am__append_1 = amd -@HAVE_INTEL_DRIVERS_TRUE@am__append_2 = intel -@NEED_OPENGL_COMMON_TRUE@am__append_3 = mesa -@HAVE_DRI_GLX_TRUE@am__append_4 = glx -@HAVE_PLATFORM_WAYLAND_TRUE@am__append_5 = egl/wayland/wayland-drm -@HAVE_GBM_TRUE@am__append_6 = gbm -@HAVE_PLATFORM_WAYLAND_TRUE@am__append_7 = egl/wayland/wayland-egl -@HAVE_EGL_TRUE@am__append_8 = egl -@HAVE_INTEL_DRIVERS_TRUE@am__append_9 = intel/tools -@HAVE_VULKAN_COMMON_TRUE@am__append_10 = vulkan/wsi -@HAVE_INTEL_VULKAN_TRUE@am__append_11 = intel/vulkan +@HAVE_PLATFORM_WAYLAND_TRUE@am__append_1 = egl/wayland/wayland-drm +@HAVE_VULKAN_COMMON_TRUE@am__append_2 = vulkan +@HAVE_AMD_DRIVERS_TRUE@am__append_3 = amd +@HAVE_INTEL_DRIVERS_TRUE@am__append_4 = intel +@HAVE_GALLIUM_VC4_TRUE@am__append_5 = broadcom +@NEED_OPENGL_COMMON_TRUE@am__append_6 = mesa +@HAVE_DRI_GLX_TRUE@am__append_7 = glx +@HAVE_GBM_TRUE@am__append_8 = gbm +@HAVE_PLATFORM_WAYLAND_TRUE@am__append_9 = egl/wayland/wayland-egl +@HAVE_EGL_TRUE@am__append_10 = egl # Requires wayland-drm -@HAVE_RADEON_VULKAN_TRUE@am__append_12 = amd/common amd/vulkan -@HAVE_GALLIUM_TRUE@am__append_13 = gallium +@HAVE_RADEON_VULKAN_TRUE@am__append_11 = amd/vulkan +@HAVE_GALLIUM_TRUE@am__append_12 = gallium subdir = src DIST_COMMON = $(am__gl_HEADERS_DIST) $(am__glx_HEADERS_DIST) \ $(am__osmesa_HEADERS_DIST) $(srcdir)/Makefile.am \ @@ -214,10 +213,9 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = . gtest util mapi/glapi/gen mapi compiler amd intel \ - mesa loader glx egl/wayland/wayland-drm gbm \ - egl/wayland/wayland-egl egl intel/tools vulkan/wsi \ - intel/vulkan amd/common amd/vulkan gallium +DIST_SUBDIRS = . gtest util mapi/glapi/gen mapi compiler \ + egl/wayland/wayland-drm vulkan amd intel broadcom mesa loader \ + glx gbm egl/wayland/wayland-egl egl amd/vulkan gallium DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -249,6 +247,8 @@ 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@ @@ -279,8 +279,6 @@ 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@ @@ -293,10 +291,11 @@ 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@ @@ -323,6 +322,8 @@ GL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@ GL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@ GREP = @GREP@ HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@ +I915_CFLAGS = @I915_CFLAGS@ +I915_LIBS = @I915_LIBS@ INDENT = @INDENT@ INDENT_FLAGS = @INDENT_FLAGS@ INSTALL = @INSTALL@ @@ -330,45 +331,40 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTEL_CFLAGS = @INTEL_CFLAGS@ -INTEL_LIBS = @INTEL_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LD_NO_UNDEFINED = @LD_NO_UNDEFINED@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBATOMIC_LIBS = @LIBATOMIC_LIBS@ LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@ LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@ 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_LDFLAGS = @LIBSENSORS_LDFLAGS@ -LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@ -LIBSHA1_LIBS = @LIBSHA1_LIBS@ +LIBSENSORS_LIBS = @LIBSENSORS_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@ @@ -389,8 +385,6 @@ 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@ @@ -410,8 +404,6 @@ 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@ @@ -427,8 +419,6 @@ 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@ @@ -437,7 +427,8 @@ STRIP = @STRIP@ SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@ SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@ SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@ -TIMESTAMP_CMD = @TIMESTAMP_CMD@ +SWR_KNL_CXXFLAGS = @SWR_KNL_CXXFLAGS@ +SWR_SKX_CXXFLAGS = @SWR_SKX_CXXFLAGS@ VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ VALGRIND_LIBS = @VALGRIND_LIBS@ VA_CFLAGS = @VA_CFLAGS@ @@ -445,15 +436,12 @@ VA_LIBS = @VA_LIBS@ VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@ VA_MAJOR = @VA_MAJOR@ VA_MINOR = @VA_MINOR@ -VC4_CFLAGS = @VC4_CFLAGS@ -VC4_LIBS = @VC4_LIBS@ VDPAU_CFLAGS = @VDPAU_CFLAGS@ VDPAU_LIBS = @VDPAU_LIBS@ 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@ @@ -461,6 +449,7 @@ VL_LIBS = @VL_LIBS@ VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@ WAYLAND_CFLAGS = @WAYLAND_CFLAGS@ WAYLAND_LIBS = @WAYLAND_LIBS@ +WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@ WAYLAND_SCANNER = @WAYLAND_SCANNER@ WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@ WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@ @@ -482,9 +471,10 @@ 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@ @@ -547,13 +537,15 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ BUILT_SOURCES = git_sha1.h CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = vulkan/registry/vk.xml getopt hgl SConscript \ + $(top_srcdir)/include/GL/mesa_glinterop.h # include only conditionally ? SUBDIRS = . gtest util mapi/glapi/gen mapi compiler $(am__append_1) \ - $(am__append_2) $(am__append_3) loader $(am__append_4) \ - $(am__append_5) $(am__append_6) $(am__append_7) \ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_6) loader $(am__append_7) \ $(am__append_8) $(am__append_9) $(am__append_10) \ - $(am__append_11) $(am__append_12) $(am__append_13) + $(am__append_11) $(am__append_12) @HAVE_OPENGL_TRUE@gldir = $(includedir)/GL @HAVE_OPENGL_TRUE@gl_HEADERS = \ @HAVE_OPENGL_TRUE@ $(top_srcdir)/include/GL/gl.h \ @@ -571,10 +563,6 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi compiler $(am__append_1) \ @HAVE_GLX_TRUE@pkgconfig_DATA = mesa/gl.pc @HAVE_COMMON_OSMESA_TRUE@osmesadir = $(includedir)/GL @HAVE_COMMON_OSMESA_TRUE@osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h -EXTRA_DIST = \ - getopt hgl SConscript \ - $(top_srcdir)/include/GL/mesa_glinterop.h - AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) AM_CPPFLAGS = \ @@ -1121,18 +1109,7 @@ uninstall-am: uninstall-glHEADERS uninstall-glxHEADERS \ .PHONY: git_sha1.h.tmp git_sha1.h.tmp: - @# Don't assume that $(top_srcdir)/.git is a directory. It may be - @# a gitlink file if $(top_srcdir) is a submodule checkout or a linked - @# worktree. - @# If we are building from a release tarball copy the bundled header. - @touch git_sha1.h.tmp - @if test -e $(top_srcdir)/.git; then \ - if which git > /dev/null; then \ - git --git-dir=$(top_srcdir)/.git log -n 1 --oneline | \ - sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ - > git_sha1.h.tmp ; \ - fi \ - fi + @sh $(top_srcdir)/bin/git_sha1_gen.sh > $@ git_sha1.h: git_sha1.h.tmp @echo "updating git_sha1.h" |