diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-06-13 16:27:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 16:27:52 +0200 |
| commit | 68884a0b8a29ce8a7c2a2671b84e2c7b9c6cb674 (patch) | |
| tree | 27b1219a6e2e34278b80af4af36c8c9ad579a76f /Makefile.am | |
| parent | aac57b3539608c28e714643de3cf581a6f6322e5 (diff) | |
| parent | cabffaf86c17cdf74f92b8ef168fb9668f699c14 (diff) | |
Merge pull request #3384 from keszybz/localed-keymap
More verbose logging in localed, unit tests, and a few tweaks to keymap conversions
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 528e0ced92..e8b50ce054 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,6 +141,10 @@ else noinst_PROGRAMS = TESTS = endif +AM_TESTS_ENVIRONMENT = \ + export SYSTEMD_KBD_MODEL_MAP=$(abs_top_srcdir)/src/locale/kbd-model-map; \ + export SYSTEMD_LANGUAGE_FALLBACK_MAP=$(abs_top_srcdir)/src/locale/language-fallback-map; + if ENABLE_BASH_COMPLETION dist_bashcompletion_DATA = $(dist_bashcompletion_data) nodist_bashcompletion_DATA = $(nodist_bashcompletion_data) @@ -213,6 +217,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/shared \ -I $(top_builddir)/src/shared \ -I $(top_srcdir)/src/network \ + -I $(top_srcdir)/src/locale \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ -I $(top_builddir)/src/journal \ @@ -4746,7 +4751,9 @@ BUSNAMES_TARGET_WANTS += \ # ------------------------------------------------------------------------------ if ENABLE_LOCALED systemd_localed_SOURCES = \ - src/locale/localed.c + src/locale/localed.c \ + src/locale/keymap-util.c \ + src/locale/keymap-util.h systemd_localed_LDADD = \ libshared.la \ @@ -4784,6 +4791,18 @@ dist_pkgdata_DATA = \ src/locale/kbd-model-map \ src/locale/language-fallback-map +test_keymap_util_SOURCES = \ + src/locale/test-keymap-util.c \ + src/locale/keymap-util.c \ + src/locale/keymap-util.h + +test_keymap_util_LDADD = \ + libshared.la \ + -ldl + +tests += \ + test-keymap-util + localectl_SOURCES = \ src/locale/localectl.c |