From 89538f96fad4dd2a18e44f0e444e0f7392147cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Mon, 6 May 2019 22:03:19 +0200 Subject: [PATCH] meson: modules: dictionaries can be added --- modules/meson.build | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/modules/meson.build b/modules/meson.build index de42d37..dc6c67f 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -22,7 +22,7 @@ deps = { } if backend_x11 - deps_x11_only = { + deps += { 'xkb': [[], [xcb_stuff, xcb_xkb]], 'xwindow': [[], [xcb_stuff]], } @@ -45,23 +45,3 @@ foreach mod, data : deps compile_args: '-DHAVE_PLUGIN_@0@'.format(mod))] endif endforeach - -if backend_x11 - foreach mod, data : deps_x11_only - sources = data[0] - dep = data[1] - - if plugs_as_libs - shared_module(mod, '@0@.c'.format(mod), sources, - dependencies: [module_sdk] + dep, - name_prefix: 'module_', - install: true, - install_dir: join_paths(get_option('libdir'), 'f00bar')) - else - modules += [declare_dependency( - sources: ['@0@.c'.format(mod)] + sources, - dependencies: [module_sdk] + dep, - compile_args: '-DHAVE_PLUGIN_@0@'.format(mod))] - endif - endforeach -endif