diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2019-09-04 15:11:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2019-09-11 12:23:04 +1000 |
| commit | c84366e85e45a20a7d00a735aa31e7587ef5160c (patch) | |
| tree | 160f76c9c67419e00679969dc51ffe80905d9367 /meson.build | |
| parent | 00f3345b804165578dc0472263d666df9ef62981 (diff) | |
| download | libinput-c84366e85e45a20a7d00a735aa31e7587ef5160c.tar.gz | |
Split utility functions into separate source files
libinput-util.h is getting a bit of a catchall bucket and it includes things
like libinput-private.h which in turn includes libwacom. This makes
libinput-util.h less useful for bits that only need e.g. the string processing
utilities.
So let's split them all up in to separate files, to be used as-needed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 5d13ca35..6dda1926 100644 --- a/meson.build +++ b/meson.build @@ -218,9 +218,45 @@ else endif ############ libinput-util.a ############ + +# Basic compilation test to make sure the headers include and define all the +# necessary bits. +util_headers = [ + 'util-bits.h', + 'util-list.h', + 'util-macros.h', + 'util-matrix.h', + 'util-prop-parsers.h', + 'util-ratelimit.h', + 'util-strings.h', + 'util-time.h', +] +foreach h: util_headers + c = configuration_data() + c.set_quoted('FILE', h) + testfile = configure_file(input : 'test/test-util-includes.c', + output : 'test-util-includes-@0@.c'.format(h), + configuration : c) + executable('test-build-@0@'.format(h), + testfile, join_paths(dir_src, h), + include_directories : [includes_src, includes_include], + install : false) +endforeach + src_libinput_util = [ - 'src/libinput-util.c', - 'src/libinput-util.h' + 'src/util-bits.h', + 'src/util-list.c', + 'src/util-list.h', + 'src/util-macros.h', + 'src/util-matrix.h', + 'src/util-ratelimit.c', + 'src/util-ratelimit.h', + 'src/util-strings.h', + 'src/util-strings.c', + 'src/util-time.h', + 'src/util-prop-parsers.h', + 'src/util-prop-parsers.c', + 'src/libinput-util.h', ] libinput_util = static_library('libinput-util', src_libinput_util, @@ -836,7 +872,6 @@ if get_option('tests') test_utils_sources = [ 'src/libinput-util.h', - 'src/libinput-util.c', 'test/test-utils.c', ] test_utils = executable('test-utils', @@ -850,7 +885,6 @@ if get_option('tests') libinput_test_runner_sources = litest_sources + [ 'src/libinput-util.h', - 'src/libinput-util.c', 'test/test-udev.c', 'test/test-path.c', 'test/test-pointer.c', |