diff --git a/catalog/meson.build b/catalog/meson.build index 3c62749cf98..fcb378ee983 100644 --- a/catalog/meson.build +++ b/catalog/meson.build @@ -25,7 +25,6 @@ support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url) foreach file : in_files catalogs += custom_target( - file, input : file + '.in', output: file, command : [sed, support_sed, '@INPUT@'], diff --git a/docs/sysvinit/meson.build b/docs/sysvinit/meson.build index 64476a5d76f..9dd9ac8ef3c 100644 --- a/docs/sysvinit/meson.build +++ b/docs/sysvinit/meson.build @@ -1,7 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later custom_target( - 'README', input : 'README.in', output : 'README', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/factory/templates/meson.build b/factory/templates/meson.build index a3ba7b166ff..3db9f255b98 100644 --- a/factory/templates/meson.build +++ b/factory/templates/meson.build @@ -3,7 +3,6 @@ factory_etc_dir = factorydir / 'etc' custom_target( - 'locale.conf', input : 'locale.conf.in', output : 'locale.conf', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], @@ -11,7 +10,6 @@ custom_target( install_dir : factory_etc_dir) custom_target( - 'vconsole.conf', input : 'vconsole.conf.in', output : 'vconsole.conf', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build index 3e51cdfaaa6..8c48c6f6fc2 100644 --- a/hwdb.d/meson.build +++ b/hwdb.d/meson.build @@ -41,7 +41,6 @@ hwdb_files_test = files( if conf.get('ENABLE_HWDB') == 1 auto_suspend_rules = custom_target( - '60-autosuspend-chromiumos.hwdb', output : '60-autosuspend-chromiumos.hwdb', command : make_autosuspend_rules_py, capture : true, diff --git a/man/meson.build b/man/meson.build index 38bfb0646c8..cd52ed5298b 100644 --- a/man/meson.build +++ b/man/meson.build @@ -29,7 +29,6 @@ custom_html_xsl = files('custom-html.xsl') xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags custom_entities_ent = custom_target( - 'custom-entities.ent', input : 'custom-entities.ent.in', output : 'custom-entities.ent', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@']) @@ -76,7 +75,6 @@ foreach tuple : manpages if xsltproc.found() p1 = custom_target( - man, input : xml, output : [man] + manaliases, command : xslt_cmd + [custom_man_xsl, '@INPUT@'], @@ -88,7 +86,6 @@ foreach tuple : manpages p2 = [] foreach htmlalias : htmlaliases link = custom_target( - htmlalias, output : htmlalias, command : [ln, '-fs', html, '@OUTPUT@']) if want_html @@ -101,7 +98,6 @@ foreach tuple : manpages endforeach p3 = custom_target( - html, input : xml, output : html, command : xslt_cmd + [custom_html_xsl, '@INPUT@'], @@ -123,7 +119,6 @@ if not have_lxml endif systemd_directives_xml = custom_target( - 'systemd.directives.xml', input : ['directives-template.xml', source_xml_files], output : 'systemd.directives.xml', depends : man_page_depends, @@ -131,7 +126,6 @@ systemd_directives_xml = custom_target( nonindex_xml_files = source_xml_files + [systemd_directives_xml] systemd_index_xml = custom_target( - 'systemd.index.xml', input : nonindex_xml_files, output : 'systemd.index.xml', command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files) @@ -148,7 +142,6 @@ foreach tuple : xsltproc.found() and have_lxml ? [['systemd.directives', '7', sy mandirn = get_option('mandir') / ('man' + section) p1 = custom_target( - man, input : xml, output : man, command : xslt_cmd + [custom_man_xsl, '@INPUT@'], @@ -160,7 +153,6 @@ foreach tuple : xsltproc.found() and have_lxml ? [['systemd.directives', '7', sy if html == 'systemd.index.html' htmlalias = 'index.html' link = custom_target( - htmlalias, input : p2, output : htmlalias, command : [ln, '-fs', html, '@OUTPUT@']) @@ -174,7 +166,6 @@ foreach tuple : xsltproc.found() and have_lxml ? [['systemd.directives', '7', sy endif p3 = custom_target( - html, input : xml, output : html, command : xslt_cmd + [custom_html_xsl, '@INPUT@'], @@ -187,13 +178,11 @@ endforeach # Cannot use run_target because those targets are used in depends # Also see https://github.com/mesonbuild/meson/issues/368. man = custom_target( - 'man', output : 'man', depends : man_pages, command : [echo]) html = custom_target( - 'html', output : 'html', depends : html_pages, command : [echo]) diff --git a/meson.build b/meson.build index 5ef61010fa6..c8fcc6a2034 100644 --- a/meson.build +++ b/meson.build @@ -1919,7 +1919,6 @@ if use_provided_vmlinux_h message('Using provided @0@'.format(provided_vmlinux_h_path)) elif use_generated_vmlinux_h vmlinux_h_dependency = custom_target( - 'vmlinux.h', output: 'vmlinux.h', command : [ bpftool, 'btf', 'dump', 'file', '/sys/kernel/btf/vmlinux', 'format', 'c' ], capture : true) @@ -2143,7 +2142,6 @@ endif ##################################################################### runtest_env = custom_target( - 'systemd-runtest.env', output : 'systemd-runtest.env', command : ['printf', 'SYSTEMD_TEST_DATA=%q\nSYSTEMD_CATALOG_DIR=%q\n', @@ -2647,7 +2645,6 @@ foreach executable : ['systemd-measure', 'systemd-sbsign', 'systemd-keyutil'] endforeach ukify = custom_target( - 'ukify', input : 'src/ukify/ukify.py', output : 'ukify', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], @@ -2797,7 +2794,6 @@ if git.found() all_files = files(all_files.stdout().split()) custom_target( - 'tags', output : 'tags', command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.project_source_root())] + all_files) run_target( @@ -2887,7 +2883,7 @@ if not meson.is_cross_build() endif meson_extract_unit_files = find_program('tools/meson-extract-unit-files.py') -custom_target('installed-unit-files.txt', +custom_target( output : 'installed-unit-files.txt', capture : true, install : want_tests != 'no' and install_tests, diff --git a/rules.d/meson.build b/rules.d/meson.build index 0f808b0fd15..933a84859ad 100644 --- a/rules.d/meson.build +++ b/rules.d/meson.build @@ -76,7 +76,6 @@ foreach tuple : rules_in want = tuple.length() == 1 or tuple[1] rule = custom_target( - tuple[0], input : tuple[0] + '.in', output: tuple[0], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 362347f828f..6a547a5e697 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -11,7 +11,6 @@ if bashcompletiondir == '' endif custom_target( - 'systemctl', input : 'systemctl.in', output : 'systemctl', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index ea540c765c6..e4252c7097b 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -6,7 +6,6 @@ if zshcompletiondir == '' endif custom_target( - '_systemctl', input : '_systemctl.in', output : '_systemctl', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/src/basic/meson.build b/src/basic/meson.build index c8779142c4f..c6c8556371d 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -126,28 +126,24 @@ basic_sources += missing_syscall_def_h generate_af_list = find_program('generate-af-list.sh') af_list_txt = custom_target( - 'af-list.txt', output : 'af-list.txt', command : [generate_af_list, cpp, files('missing_socket.h')], capture : true) generate_arphrd_list = find_program('generate-arphrd-list.sh') arphrd_list_txt = custom_target( - 'arphrd-list.txt', output : 'arphrd-list.txt', command : [generate_arphrd_list, cpp, files('include/linux/if_arp.h')], capture : true) generate_cap_list = find_program('generate-cap-list.sh') cap_list_txt = custom_target( - 'cap-list.txt', output : 'cap-list.txt', command : [generate_cap_list, cpp, files('include/linux/capability.h')], capture : true) generate_errno_list = find_program('generate-errno-list.sh') errno_list_txt = custom_target( - 'errno-list.txt', output : 'errno-list.txt', command : [generate_errno_list, cpp], capture : true) @@ -160,7 +156,6 @@ foreach item : [['af', af_list_txt, 'af', '', [''], @@ -276,7 +273,6 @@ gperf_file = custom_target( fname = 'ip-protocol-from-name.inc' target1 = custom_target( - fname, input : gperf_file, output : fname, command : [gperf, @@ -290,7 +286,6 @@ target1 = custom_target( fname = 'ip-protocol-to-name.inc' awkscript = 'ip-protocol-to-name.awk' target2 = custom_target( - fname, input : [awkscript, ip_protocol_list_txt], output : fname, command : [awk, '-f', '@INPUT0@', '@INPUT1@'], @@ -301,7 +296,6 @@ shared_sources += [target1, target2] fname = 'ethtool-link-mode.inc' ethtool_link_mode_inc = custom_target( - fname, input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'], output : fname, command : [python, '@INPUT0@', '--header', cpp, '@INPUT1@'], @@ -313,7 +307,6 @@ sources += shared_sources fname = 'ethtool-link-mode.xml' ethtool_link_mode_xml = custom_target( - fname, input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'], output : fname, command : [python, '@INPUT0@', '--xml', cpp, '@INPUT1@'], diff --git a/src/ssh-generator/meson.build b/src/ssh-generator/meson.build index e36f9fae08c..b14ef46ff5a 100644 --- a/src/ssh-generator/meson.build +++ b/src/ssh-generator/meson.build @@ -13,7 +13,6 @@ executables += [ if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1 custom_target( - '20-systemd-ssh-proxy.conf', input : '20-systemd-ssh-proxy.conf.in', output : '20-systemd-ssh-proxy.conf', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/src/test/meson.build b/src/test/meson.build index 0ccc9332cdf..e8e4a663d2d 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -2,7 +2,6 @@ awkscript = 'test-hashmap-ordered.awk' test_hashmap_ordered_c = custom_target( - 'test-hashmap-ordered.c', input : [awkscript, 'test-hashmap-plain.c'], output : 'test-hashmap-ordered.c', command : [awk, '-f', '@INPUT0@', '@INPUT1@'], @@ -28,7 +27,6 @@ endif generate_sym_test_py = find_program('generate-sym-test.py') test_libsystemd_sym_c = custom_target( - 'test-libsystemd-sym.c', input : [libsystemd_sym_path] + systemd_headers + libsystemd_sources, output : 'test-libsystemd-sym.c', command : [generate_sym_test_py, libsystemd_sym_path, libsystemd_dir_path] + systemd_headers, @@ -36,7 +34,6 @@ test_libsystemd_sym_c = custom_target( build_by_default : want_tests != 'false') test_libudev_sym_c = custom_target( - 'test-libudev-sym.c', input : [libudev_sym_path, libudev_h_path] + libudev_sources, output : 'test-libudev-sym.c', command : [generate_sym_test_py, libudev_sym_path, libudev_dir_path, libudev_h_path], diff --git a/src/timesync/meson.build b/src/timesync/meson.build index 608589e4b84..c7694de6abf 100644 --- a/src/timesync/meson.build +++ b/src/timesync/meson.build @@ -15,7 +15,6 @@ timesyncd_extract_sources = files( ) timesyncd_gperf_c = custom_target( - 'timesyncd-gperf.c', input : 'timesyncd-gperf.gperf', output : 'timesyncd-gperf.c', command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) @@ -56,7 +55,6 @@ executables += [ ] custom_target( - 'timesyncd.conf', input : 'timesyncd.conf.in', output : 'timesyncd.conf', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/src/udev/meson.build b/src/udev/meson.build index 7d994ad5d0c..34fc4274783 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -63,7 +63,6 @@ endif generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh') keyboard_keys_list_txt = custom_target( - 'keyboard-keys-list.txt', input : files('../basic/include/linux/input.h'), output : 'keyboard-keys-list.txt', command : [generate_keyboard_keys_list, cpp, '@INPUT@'], @@ -72,7 +71,6 @@ keyboard_keys_list_txt = custom_target( generate_keyboard_keys_gperf = find_program('generate-keyboard-keys-gperf.sh') fname = 'keyboard-keys-from-name.gperf' gperf_file = custom_target( - fname, input : keyboard_keys_list_txt, output : fname, command : [generate_keyboard_keys_gperf, '@INPUT@'], @@ -80,7 +78,6 @@ gperf_file = custom_target( fname = 'keyboard-keys-from-name.inc' keyboard_keys_from_name_inc = custom_target( - fname, input : gperf_file, output : fname, command : [gperf, @@ -98,7 +95,6 @@ generated_sources += keyboard_keys_from_name_inc udev_link_gperf_gperf = files('net/link-config-gperf.gperf') link_config_gperf_c = custom_target( - 'link-config-gperf.c', input : udev_link_gperf_gperf, output : 'link-config-gperf.c', command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) @@ -277,7 +273,6 @@ if install_sysconfdir_samples endif udev_pc = custom_target( - 'udev.pc', input : 'udev.pc.in', output : 'udev.pc', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/src/userdb/meson.build b/src/userdb/meson.build index 57948d8df99..4bb8ac17a69 100644 --- a/src/userdb/meson.build +++ b/src/userdb/meson.build @@ -26,7 +26,6 @@ executables += [ if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1 custom_target( - '20-systemd-userdb.conf', input : '20-systemd-userdb.conf.in', output : '20-systemd-userdb.conf', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build index 909baa2be31..10cbd553aa2 100644 --- a/sysctl.d/meson.build +++ b/sysctl.d/meson.build @@ -13,7 +13,6 @@ if cc.sizeof('long') > 4 endif custom_target( - '50-coredump.conf', input : '50-coredump.conf.in', output : '50-coredump.conf', command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build index 4402b1006b1..84fadfe3f70 100644 --- a/sysusers.d/meson.build +++ b/sysusers.d/meson.build @@ -20,7 +20,6 @@ in_files = [['basic.conf', true], foreach tuple : in_files file = tuple[0] custom_target( - file, input : file + '.in', output: file, command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build index 54115909a24..48d962b520d 100644 --- a/test/fuzz/meson.build +++ b/test/fuzz/meson.build @@ -11,7 +11,6 @@ directives = [['fuzz-network-parser', 'directives.network', networkd_network_gpe foreach tuple : directives directive = custom_target( - tuple[1], output: tuple[1], command: [generate_directives_py, tuple[2]], capture: true) @@ -26,7 +25,6 @@ foreach section : ['Automount', 'Mount', 'Path', 'Scope', 'Service', 'Slice', 'S sec_rx = section == 'Service' ? '(Service|Unit|Install)' : section name = 'directives.@0@'.format(unit_type) unit_directives += custom_target( - name, output: name, command: [generate_directives_py, load_fragment_gperf_gperf, sec_rx, unit_type], capture: true) diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index db58a9817a1..203eb7bb552 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -45,7 +45,6 @@ in_files = [ foreach f : in_files if f.length() == 1 or conf.get(f[1]) == 1 custom_target( - f[0], input : f[0] + '.in', output: f[0], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], diff --git a/units/meson.build b/units/meson.build index a8b00405623..8a3ce203a10 100644 --- a/units/meson.build +++ b/units/meson.build @@ -929,7 +929,6 @@ foreach unit : units if needs_jinja t = custom_target( - name, input : source, output : name, command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],