diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-01-04 20:41:37 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-01-19 07:06:32 +0900 |
| commit | 0275e918afd184d297c3da4f6f64ad16f7dead71 (patch) | |
| tree | d6fa1de4b668b1586b7016a6b47e721e23a14fda | |
| parent | f98df767e19bd655f5e0c089f1fe7bd2b1d3af28 (diff) | |
| download | systemd-0275e918afd184d297c3da4f6f64ad16f7dead71.tar.gz | |
meson: move source file list for systemd-xdg-autostart-generator and its tests
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/fuzz/meson.build | 4 | ||||
| -rw-r--r-- | src/test/meson.build | 8 | ||||
| -rw-r--r-- | src/xdg-autostart-generator/meson.build | 18 |
4 files changed, 20 insertions, 14 deletions
diff --git a/meson.build b/meson.build index ec3bb605f2..7396c943c0 100644 --- a/meson.build +++ b/meson.build @@ -1738,6 +1738,7 @@ subdir('src/timesync') subdir('src/tmpfiles') subdir('src/vconsole') subdir('src/boot/efi') +subdir('src/xdg-autostart-generator') subdir('src/test') subdir('src/fuzz') @@ -2400,8 +2401,7 @@ endif if conf.get('ENABLE_XDG_AUTOSTART') == 1 executable( 'systemd-xdg-autostart-generator', - 'src/xdg-autostart-generator/xdg-autostart-generator.c', - 'src/xdg-autostart-generator/xdg-autostart-service.c', + systemd_xdg_autostart_generator_sources, include_directories : includes, link_with : [libshared], install_rpath : rootlibexecdir, diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build index 46307375a4..7a62527321 100644 --- a/src/fuzz/meson.build +++ b/src/fuzz/meson.build @@ -109,9 +109,5 @@ fuzzers += [ [['src/fuzz/fuzz-time-util.c']], - [['src/xdg-autostart-generator/fuzz-xdg-desktop.c', - 'src/xdg-autostart-generator/xdg-autostart-service.h', - 'src/xdg-autostart-generator/xdg-autostart-service.c']], - [['src/udev/fuzz-udev-rule-parse-value.c']], ] diff --git a/src/test/meson.build b/src/test/meson.build index 656a33de91..6f2542c4d6 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -871,11 +871,3 @@ tests += [ libshared], [threads]], ] - -############################################################ - -tests += [ - [['src/xdg-autostart-generator/test-xdg-autostart.c', - 'src/xdg-autostart-generator/xdg-autostart-service.c', - 'src/xdg-autostart-generator/xdg-autostart-service.h']], -] diff --git a/src/xdg-autostart-generator/meson.build b/src/xdg-autostart-generator/meson.build new file mode 100644 index 0000000000..aa722f7f3c --- /dev/null +++ b/src/xdg-autostart-generator/meson.build @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +systemd_xdg_autostart_generator_sources = files( + 'xdg-autostart-generator.c', + 'xdg-autostart-service.c', + 'xdg-autostart-service.h') + +tests += [ + [['src/xdg-autostart-generator/test-xdg-autostart.c', + 'src/xdg-autostart-generator/xdg-autostart-service.c', + 'src/xdg-autostart-generator/xdg-autostart-service.h']], +] + +fuzzers += [ + [['src/xdg-autostart-generator/fuzz-xdg-desktop.c', + 'src/xdg-autostart-generator/xdg-autostart-service.c', + 'src/xdg-autostart-generator/xdg-autostart-service.h']], +] |