s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'par' into 'master'

Browse Source 
build: Generate files before compiling sources

See merge request World/Phosh/squeekboard!562
This commit is contained in:
dcz
2022-06-30 19:03:45 +00:00
parent 50ef4ab433 9528339e02
commit 12572b9de2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/meson.build
View File

@ -25,18 +25,22 @@ sources = [
'../eek/eek-renderer.c', '../eek/eek-renderer.c',
'../eek/eek-types.c', '../eek/eek-types.c',
'../eek/layersurface.c', '../eek/layersurface.c',
dbus_src,
'../eekboard/eekboard-context-service.c', '../eekboard/eekboard-context-service.c',
# '../eekboard/eekboard-xklutil.c', ]
generated_sources = declare_dependency(
sources: [
dbus_src,
squeekboard_resources, squeekboard_resources,
wl_proto_sources, wl_proto_sources,
] ],
)
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
deps = [ deps = [
# dependency('glib-2.0', version: '>=2.26.0'), generated_sources,
dependency('gio-2.0', version: '>=2.26.0'), dependency('gio-2.0', version: '>=2.26.0'),
dependency('gio-unix-2.0'), dependency('gio-unix-2.0'),
dependency('gnome-desktop-3.0', version: '>=3.0'), dependency('gnome-desktop-3.0', version: '>=3.0'),
@ -101,8 +105,6 @@ libsqueekboard = static_library('libsqueekboard',
squeekboard = executable('squeekboard', squeekboard = executable('squeekboard',
'server-main.c', 'server-main.c',
wl_proto_sources,
squeekboard_resources,
link_with: libsqueekboard, link_with: libsqueekboard,
include_directories: [include_directories('..'), include_directories('../eek')], include_directories: [include_directories('..'), include_directories('../eek')],
dependencies: deps, dependencies: deps,