configure: allow building with python3
Pretty much all of the scripts are python2+3 compatible. Check and allow using python3, while adjusting the PYTHON2 refs. Note: - python3.4 is used as it's the earliest supported version - python2 chosen prior to python3 v2: use python2 by default Cc: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
parent
6d7d3dbda5
commit
986033a275
|
@ -124,9 +124,7 @@ AC_PROG_GREP
|
||||||
AC_PROG_NM
|
AC_PROG_NM
|
||||||
AM_PROG_AS
|
AM_PROG_AS
|
||||||
AX_CHECK_GNU_MAKE
|
AX_CHECK_GNU_MAKE
|
||||||
AM_PATH_PYTHON([2.7],, [:])
|
AM_PATH_PYTHON([2.7],, [AM_PATH_PYTHON([3.4],, [:])])
|
||||||
PYTHON2=$PYTHON
|
|
||||||
AC_SUBST([PYTHON2])
|
|
||||||
|
|
||||||
AC_PROG_SED
|
AC_PROG_SED
|
||||||
AC_PROG_MKDIR_P
|
AC_PROG_MKDIR_P
|
||||||
|
@ -159,7 +157,7 @@ fi
|
||||||
|
|
||||||
AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
|
AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
|
||||||
|
|
||||||
if test "$PYTHON2" = ":"; then
|
if test "$PYTHON" = ":"; then
|
||||||
if test ! -f "$srcdir/src/util/format_srgb.c"; then
|
if test ! -f "$srcdir/src/util/format_srgb.c"; then
|
||||||
AC_MSG_ERROR([Python not found - unable to generate sources])
|
AC_MSG_ERROR([Python not found - unable to generate sources])
|
||||||
fi
|
fi
|
||||||
|
@ -3376,7 +3374,7 @@ if test "x$enable_llvm" = xyes; then
|
||||||
echo " LLVM_LDFLAGS: $LLVM_LDFLAGS"
|
echo " LLVM_LDFLAGS: $LLVM_LDFLAGS"
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
echo " PYTHON2: $PYTHON2"
|
echo " PYTHON: $PYTHON"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo " Run '${MAKE-make}' to build Mesa"
|
echo " Run '${MAKE-make}' to build Mesa"
|
||||||
|
|
|
@ -52,7 +52,7 @@ else:
|
||||||
ver_req = distutils.version.LooseVersion('$1')
|
ver_req = distutils.version.LooseVersion('$1')
|
||||||
ver_act = distutils.version.LooseVersion(mako.__version__)
|
ver_act = distutils.version.LooseVersion(mako.__version__)
|
||||||
sys.exit(int(ver_req > ver_act))
|
sys.exit(int(ver_req > ver_act))
|
||||||
" | $PYTHON2 -
|
" | $PYTHON -
|
||||||
|
|
||||||
if test $? -ne 0 ; then
|
if test $? -ne 0 ; then
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
.PHONY: git_sha1.h
|
.PHONY: git_sha1.h
|
||||||
git_sha1.h:
|
git_sha1.h:
|
||||||
@echo "updating $@"
|
@echo "updating $@"
|
||||||
@$(PYTHON2) $(top_srcdir)/bin/git_sha1_gen.py --output $@
|
@$(PYTHON) $(top_srcdir)/bin/git_sha1_gen.py --output $@
|
||||||
|
|
||||||
BUILT_SOURCES = git_sha1.h
|
BUILT_SOURCES = git_sha1.h
|
||||||
CLEANFILES = $(BUILT_SOURCES)
|
CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
|
@ -66,6 +66,6 @@ common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
|
||||||
|
|
||||||
common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
|
common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
|
||||||
$(AM_V_at)$(MKDIR_P) $(@D)
|
$(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
$(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
|
$(AM_V_GEN) $(PYTHON) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
|
||||||
|
|
||||||
BUILT_SOURCES = $(AMD_GENERATED_FILES)
|
BUILT_SOURCES = $(AMD_GENERATED_FILES)
|
||||||
|
|
|
@ -140,7 +140,7 @@ vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
|
||||||
|
|
||||||
radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml)
|
radv_entrypoints.c: radv_entrypoints_gen.py radv_extensions.py $(vulkan_api_xml)
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_entrypoints_gen.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_entrypoints_gen.py \
|
||||||
--xml $(vulkan_api_xml) \
|
--xml $(vulkan_api_xml) \
|
||||||
--outdir $(builddir)
|
--outdir $(builddir)
|
||||||
radv_entrypoints.h: radv_entrypoints.c
|
radv_entrypoints.h: radv_entrypoints.c
|
||||||
|
@ -148,7 +148,7 @@ radv_entrypoints.h: radv_entrypoints.c
|
||||||
radv_extensions.c: radv_extensions.py \
|
radv_extensions.c: radv_extensions.py \
|
||||||
$(vulkan_api_xml)
|
$(vulkan_api_xml)
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_extensions.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_extensions.py \
|
||||||
--xml $(vulkan_api_xml) \
|
--xml $(vulkan_api_xml) \
|
||||||
--out-c radv_extensions.c \
|
--out-c radv_extensions.c \
|
||||||
--out-h radv_extensions.h
|
--out-h radv_extensions.h
|
||||||
|
@ -157,7 +157,7 @@ radv_extensions.h: radv_extensions.c
|
||||||
vk_format_table.c: vk_format_table.py \
|
vk_format_table.c: vk_format_table.py \
|
||||||
vk_format_parse.py \
|
vk_format_parse.py \
|
||||||
vk_format_layout.csv
|
vk_format_layout.csv
|
||||||
$(PYTHON2) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@
|
$(PYTHON) $(srcdir)/vk_format_table.py $(srcdir)/vk_format_layout.csv > $@
|
||||||
|
|
||||||
BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
|
BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
|
||||||
CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@host_cpu@.json
|
CLEANFILES = $(BUILT_SOURCES) dev_icd.json radeon_icd.@host_cpu@.json
|
||||||
|
@ -190,11 +190,11 @@ icdconf_DATA = radeon_icd.@host_cpu@.json
|
||||||
noinst_DATA = dev_icd.json
|
noinst_DATA = dev_icd.json
|
||||||
|
|
||||||
dev_icd.json : radv_extensions.py radv_icd.py
|
dev_icd.json : radv_extensions.py radv_icd.py
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \
|
||||||
--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
|
--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
|
||||||
|
|
||||||
radeon_icd.@host_cpu@.json : radv_extensions.py radv_icd.py
|
radeon_icd.@host_cpu@.json : radv_extensions.py radv_icd.py
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/radv_icd.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/radv_icd.py \
|
||||||
--lib-path="${libdir}" --out $@
|
--lib-path="${libdir}" --out $@
|
||||||
|
|
||||||
include $(top_srcdir)/install-lib-links.mk
|
include $(top_srcdir)/install-lib-links.mk
|
||||||
|
|
|
@ -56,7 +56,7 @@ EXTRA_DIST = \
|
||||||
qpu/meson.build
|
qpu/meson.build
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
include Makefile.genxml.am
|
include Makefile.genxml.am
|
||||||
include Makefile.cle.am
|
include Makefile.cle.am
|
||||||
|
|
|
@ -68,7 +68,7 @@ EXTRA_DIST = \
|
||||||
meson.build
|
meson.build
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
include Makefile.spirv.am
|
include Makefile.spirv.am
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ TESTS += glsl/glcpp/tests/glcpp-test.sh \
|
||||||
|
|
||||||
TESTS_ENVIRONMENT= \
|
TESTS_ENVIRONMENT= \
|
||||||
export abs_builddir=$(abs_builddir); \
|
export abs_builddir=$(abs_builddir); \
|
||||||
export PYTHON2=$(PYTHON2); \
|
export PYTHON=$(PYTHON); \
|
||||||
export PYTHON_FLAGS=$(PYTHON_FLAGS);
|
export PYTHON_FLAGS=$(PYTHON_FLAGS);
|
||||||
|
|
||||||
check_PROGRAMS += \
|
check_PROGRAMS += \
|
||||||
|
|
|
@ -13,4 +13,4 @@ if [ -z "$srcdir" -o -z "$abs_builddir" ]; then
|
||||||
abs_builddir=`pwd`/../../../
|
abs_builddir=`pwd`/../../../
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro
|
$PYTHON $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
$PYTHON2 $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test
|
$PYTHON $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
$PYTHON2 $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/
|
$PYTHON $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/
|
||||||
|
|
|
@ -141,7 +141,7 @@ GLVND_GEN_DEPS = generate/gen_egl_dispatch.py \
|
||||||
generate/egl.xml generate/eglFunctionList.py generate/genCommon.py \
|
generate/egl.xml generate/eglFunctionList.py generate/genCommon.py \
|
||||||
generate/egl_other.xml
|
generate/egl_other.xml
|
||||||
|
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
g_egldispatchstubs.c: $(GLVND_GEN_DEPS)
|
g_egldispatchstubs.c: $(GLVND_GEN_DEPS)
|
||||||
$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py source \
|
$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py source \
|
||||||
$(top_srcdir)/src/egl/generate/eglFunctionList.py \
|
$(top_srcdir)/src/egl/generate/eglFunctionList.py \
|
||||||
|
|
|
@ -54,7 +54,7 @@ libgallium_la_SOURCES += \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
indices/u_indices_gen.c: indices/u_indices_gen.py
|
indices/u_indices_gen.c: indices/u_indices_gen.py
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
|
|
|
@ -13,7 +13,7 @@ AM_CFLAGS = \
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
|
ir3/ir3_nir_trig.c: ir3/ir3_nir_trig.py $(top_srcdir)/src/compiler/nir/nir_algebraic.py
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
|
$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/ir3/ir3_nir_trig.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libfreedreno.la
|
noinst_LTLIBRARIES = libfreedreno.la
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
|
||||||
|
|
||||||
egd_tables.h: $(srcdir)/egd_tables.py $(srcdir)/evergreend.h
|
egd_tables.h: $(srcdir)/egd_tables.py $(srcdir)/evergreend.h
|
||||||
$(AM_V_at)$(MKDIR_P) $(@D)
|
$(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
$(AM_V_GEN) $(PYTHON2) $(srcdir)/egd_tables.py $(srcdir)/evergreend.h > $@
|
$(AM_V_GEN) $(PYTHON) $(srcdir)/egd_tables.py $(srcdir)/evergreend.h > $@
|
||||||
|
|
||||||
BUILT_SOURCES = $(R600_GENERATED_FILES)
|
BUILT_SOURCES = $(R600_GENERATED_FILES)
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
|
|
|
@ -48,7 +48,7 @@ GEN_DRIINFO_INPUTS = \
|
||||||
$(top_srcdir)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
|
$(top_srcdir)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
|
||||||
$(srcdir)/driinfo_radeonsi.h
|
$(srcdir)/driinfo_radeonsi.h
|
||||||
|
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
MERGE_DRIINFO = $(top_srcdir)/src/util/merge_driinfo.py
|
MERGE_DRIINFO = $(top_srcdir)/src/util/merge_driinfo.py
|
||||||
|
|
||||||
si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
|
si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
|
||||||
|
|
|
@ -98,7 +98,7 @@ BUILT_SOURCES = \
|
||||||
rasterizer/core/backends/gen_rasterizer.hpp
|
rasterizer/core/backends/gen_rasterizer.hpp
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
gen_swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp swr_context.h
|
gen_swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/codegen/templates/gen_llvm.hpp swr_context.h
|
||||||
$(PYTHON_GEN) \
|
$(PYTHON_GEN) \
|
||||||
$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
|
$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
|
||||||
|
|
|
@ -50,7 +50,7 @@ AM_CXXFLAGS = \
|
||||||
$(VISIBILITY_CXXFLAGS)
|
$(VISIBILITY_CXXFLAGS)
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
lib_LTLIBRARIES =
|
lib_LTLIBRARIES =
|
||||||
check_LTLIBRARIES =
|
check_LTLIBRARIES =
|
||||||
|
|
|
@ -35,7 +35,7 @@ BUILT_SOURCES += $(COMPILER_GENERATED_FILES)
|
||||||
compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \
|
compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \
|
||||||
$(top_srcdir)/src/compiler/nir/nir_algebraic.py
|
$(top_srcdir)/src/compiler/nir/nir_algebraic.py
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
|
$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
compiler/brw_nir_trig_workarounds.py
|
compiler/brw_nir_trig_workarounds.py
|
||||||
|
|
|
@ -28,7 +28,7 @@ vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
|
||||||
vulkan/anv_extensions.py \
|
vulkan/anv_extensions.py \
|
||||||
$(vulkan_api_xml)
|
$(vulkan_api_xml)
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_entrypoints_gen.py \
|
||||||
--xml $(vulkan_api_xml) \
|
--xml $(vulkan_api_xml) \
|
||||||
--outdir $(builddir)/vulkan
|
--outdir $(builddir)/vulkan
|
||||||
vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c
|
vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c
|
||||||
|
@ -37,7 +37,7 @@ vulkan/anv_extensions.c: vulkan/anv_extensions_gen.py \
|
||||||
vulkan/anv_extensions.py \
|
vulkan/anv_extensions.py \
|
||||||
$(vulkan_api_xml)
|
$(vulkan_api_xml)
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \
|
||||||
--xml $(vulkan_api_xml) \
|
--xml $(vulkan_api_xml) \
|
||||||
--out-c $@
|
--out-c $@
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ vulkan/anv_extensions.h: vulkan/anv_extensions_gen.py \
|
||||||
vulkan/anv_extensions.py \
|
vulkan/anv_extensions.py \
|
||||||
$(vulkan_api_xml)
|
$(vulkan_api_xml)
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions_gen.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_extensions_gen.py \
|
||||||
--xml $(vulkan_api_xml) \
|
--xml $(vulkan_api_xml) \
|
||||||
--out-h $@
|
--out-h $@
|
||||||
|
|
||||||
|
@ -65,12 +65,12 @@ EXTRA_DIST += \
|
||||||
|
|
||||||
vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
|
vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \
|
||||||
--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
|
--lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@
|
||||||
|
|
||||||
vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
|
vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py
|
||||||
$(MKDIR_GEN)
|
$(MKDIR_GEN)
|
||||||
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \
|
$(AM_V_GEN)$(PYTHON) $(srcdir)/vulkan/anv_icd.py \
|
||||||
--lib-path="${libdir}" --out $@
|
--lib-path="${libdir}" --out $@
|
||||||
|
|
||||||
if HAVE_INTEL_VULKAN
|
if HAVE_INTEL_VULKAN
|
||||||
|
|
|
@ -59,7 +59,7 @@ AM_CPPFLAGS = \
|
||||||
include Makefile.sources
|
include Makefile.sources
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
glapi_gen_mapi_deps := \
|
glapi_gen_mapi_deps := \
|
||||||
mapi_abi.py \
|
mapi_abi.py \
|
||||||
|
|
|
@ -236,7 +236,7 @@ COMMON = $(API_XML) \
|
||||||
|
|
||||||
COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
|
COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
|
||||||
|
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ CLEANFILES = \
|
||||||
$(BUILT_SOURCES) \
|
$(BUILT_SOURCES) \
|
||||||
program/program_parse.tab.h
|
program/program_parse.tab.h
|
||||||
|
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \
|
main/get_hash.h: ../mapi/glapi/gen/gl_and_es_API.xml main/get_hash_params.py \
|
||||||
main/get_hash_generator.py
|
main/get_hash_generator.py
|
||||||
|
|
|
@ -130,7 +130,7 @@ EXTRA_DIST = \
|
||||||
meson.build
|
meson.build
|
||||||
|
|
||||||
brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
|
brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
|
||||||
$(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
|
$(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
|
||||||
--code=$(builddir)/brw_oa_metrics.c \
|
--code=$(builddir)/brw_oa_metrics.c \
|
||||||
--header=$(builddir)/brw_oa_metrics.h \
|
--header=$(builddir)/brw_oa_metrics.h \
|
||||||
$(i965_oa_xml_FILES:%=$(srcdir)/%)
|
$(i965_oa_xml_FILES:%=$(srcdir)/%)
|
||||||
|
|
|
@ -94,7 +94,7 @@ EXTRA_DIST = \
|
||||||
sha1/README \
|
sha1/README \
|
||||||
meson.build
|
meson.build
|
||||||
|
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
format_srgb.c: format_srgb.py
|
format_srgb.c: format_srgb.py
|
||||||
$(PYTHON_GEN) $(srcdir)/format_srgb.py > $@
|
$(PYTHON_GEN) $(srcdir)/format_srgb.py > $@
|
||||||
|
|
|
@ -70,7 +70,7 @@ CLEANFILES = \
|
||||||
# Default target options.h
|
# Default target options.h
|
||||||
LOCALEDIR := .
|
LOCALEDIR := .
|
||||||
options.h: t_options.h $(MOS)
|
options.h: t_options.h $(MOS)
|
||||||
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
|
$(AM_V_GEN) $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
|
||||||
|
|
||||||
# Update .mo files from the corresponding .po files.
|
# Update .mo files from the corresponding .po files.
|
||||||
%/LC_MESSAGES/options.mo: %.po
|
%/LC_MESSAGES/options.mo: %.po
|
||||||
|
|
|
@ -6,7 +6,7 @@ vulkan_includedir = $(includedir)/vulkan
|
||||||
vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
|
vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
|
||||||
|
|
||||||
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
|
||||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
util/gen_enum_to_str.py \
|
util/gen_enum_to_str.py \
|
||||||
|
|
Loading…
Reference in New Issue