diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/g-ir-tool-template.in | 2 | ||||
| -rw-r--r-- | tools/meson.build | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in index 75bf759c..6e98f52e 100755 --- a/tools/g-ir-tool-template.in +++ b/tools/g-ir-tool-template.in @@ -81,7 +81,7 @@ if not os.path.isfile(os.path.join(pylibdir, 'giscanner', '_giscanner' + py_mod_ builddir = os.path.abspath(os.path.join(filedir, '..')) pylibdir = builddir builtins.__dict__['GIRDIR'].append(os.path.join(filedir, os.pardir, 'gir')) - gdump_path = os.path.join(builddir, 'girepository', 'gdump.c') + gdump_path = os.path.join(builddir, 'giscanner', 'gdump.c') if os.path.isfile(gdump_path): builtins.__dict__['GDUMP_PATH'] = gdump_path else: diff --git a/tools/meson.build b/tools/meson.build index f272c955..46b487e0 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -30,6 +30,11 @@ foreach tool : tools output: tool[0], configuration: tools_conf, install_dir: get_option('bindir'), + # Not yet supported, but put here to document intention. + # depends: [ + # giscanner_pymod + # ], + # depend_files: giscanner_built_files, ) tool_output += tool_bin # Provide tools for others when we're a subproject and they use the Meson GNOME module @@ -59,6 +64,7 @@ gircompiler = executable('g-ir-compiler', 'compiler.c', install: true, c_args: custom_c_args, ) +meson.override_find_program('g-ir-compiler', gircompiler) girgenerate = executable('g-ir-generate', 'generate.c', dependencies: [ @@ -68,15 +74,11 @@ girgenerate = executable('g-ir-generate', 'generate.c', install: true, c_args: custom_c_args, ) +meson.override_find_program('g-ir-generate', girgenerate) girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', dependencies: girepo_dep, install: true, c_args: custom_c_args, ) - -if not get_option('gi_cross_use_prebuilt_gi') - meson.override_find_program('g-ir-compiler', gircompiler) - meson.override_find_program('g-ir-generate', girgenerate) - meson.override_find_program('g-ir-inspect', girinspect) -endif +meson.override_find_program('g-ir-inspect', girinspect) |