diff --git a/meson.build b/meson.build index 4488b815..9c4240dd 100644 --- a/meson.build +++ b/meson.build @@ -40,6 +40,7 @@ else endif prefix = get_option('prefix') +bindir = join_paths(prefix, get_option('bindir')) datadir = join_paths(prefix, get_option('datadir')) pkgdatadir = join_paths(datadir, meson.project_name()) if get_option('depdatadir') == '' @@ -67,4 +68,5 @@ subdir('data') subdir('protocols') subdir('eek') subdir('src') +subdir('tools') subdir('tests') diff --git a/src/meson.build b/src/meson.build index 7e106c49..e8a369df 100644 --- a/src/meson.build +++ b/src/meson.build @@ -112,16 +112,3 @@ squeekboard = executable('squeekboard', '-DEEK_COMPILATION=1'], ) -bindir = join_paths(prefix, get_option('bindir')) - -test_layout = custom_target('squeekboard-test-layout', - build_by_default: true, - # meson doesn't track all inputs, cargo does - build_always_stale: true, - output: ['squeekboard-test-layout'], - console: true, - command: [cargo_build] + cargo_build_flags - + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'], - install: true, - install_dir: bindir, -) diff --git a/tools/meson.build b/tools/meson.build new file mode 100644 index 00000000..f08f9473 --- /dev/null +++ b/tools/meson.build @@ -0,0 +1,11 @@ +test_layout = custom_target('squeekboard-test-layout', + build_by_default: true, + # meson doesn't track all inputs, cargo does + build_always_stale: true, + output: ['squeekboard-test-layout'], + console: true, + command: [cargo_build] + cargo_build_flags + + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'], + install: true, + install_dir: bindir, +)