meson: drop explicit custom_target names

[1] says:
> Since 0.60.0 the name argument is optional and defaults to the basename of
> the first output
We specify >= 0.62 as the supported version, so drop the duplicate name in all cases
where it is the same as outputs[0], i.e. almost all cases.

[1] https://mesonbuild.com/Reference-manual_functions.html#custom_target

diff --git a/catalog/meson.build b/catalog/meson.build
index 3c62749cf982be69cc6a4ab96e24a95af119cd1a..fcb378ee983af843525d6ffb39cd26dadb360fb2 100644 (file)
--- 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 64476a5d76f3c99b5e8f881143c22c6bf1a27817..9dd9ac8ef3cd4ee633a9fae48569f651d57d06ea 100644 (file)
--- 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 a3ba7b166ffe031bd365663d721042af3b56e7a9..3db9f255b986f0e4e4dc5e595a2f634f39fb0a93 100644 (file)
--- 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 3e51cdfaaa6d4e6fd8a622dab1a5aed8bd0c51ce..8c48c6f6fc2dc99457de069289398ea4a05a1965 100644 (file)
--- 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 38bfb0646c826a02502bea4f23a5882713330ead..cd52ed5298bee224ff942d96b4d8962968adc4a8 100644 (file)
--- 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 5ef61010fa6cf7f553e0bddd58b5f8c3f234b68a..c8fcc6a2034f9df730d61caadf9bde531ab43c98 100644 (file)
--- 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 0f808b0fd154d5450619210d93e3eb641619db9b..933a84859adfa90100cfe86a899ae7fe8aa039f5 100644 (file)
--- 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 362347f828f35a9cb5178ad92e7ff3670a2026e7..6a547a5e6975d0059ae327852f55a707fe6c0685 100644 (file)
--- 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 ea540c765c63b0ea418c38324612aad8fa7e837a..e4252c7097b55e3a11b9c68c067d9c5ce2232b2c 100644 (file)
--- 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 c8779142c4fa53ce68b217fe14bce51b9e8e73c3..c6c8556371d70fd9ffaf43f3dd10bbde38459476 100644 (file)
--- 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',         '',        ['<sys/sock
 
         fname = '@0@-from-name.gperf'.format(item[0])
         gperf_file = custom_target(
-                fname,
                 input : item[1],
                 output : fname,
                 command : [generate_gperfs, item[2], item[3], '@INPUT@'] + item[4],
@@ -168,7 +163,6 @@ foreach item : [['af',     af_list_txt,     'af',         '',        ['<sys/sock
 
         fname = '@0@-from-name.inc'.format(item[0])
         target1 = custom_target(
-                fname,
                 input : gperf_file,
                 output : fname,
                 command : [gperf,
@@ -182,7 +176,6 @@ foreach item : [['af',     af_list_txt,     'af',         '',        ['<sys/sock
         fname = '@0@-to-name.inc'.format(item[0])
         awkscript = '@0@-to-name.awk'.format(item[0])
         target2 = custom_target(
-                fname,
                 input : [awkscript, item[1]],
                 output : fname,
                 command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -258,7 +251,6 @@ if r.returncode() != 0
 endif
 
 filesystems_gperf_h = custom_target(
-        'filesystems-gperf.h',
         input : 'filesystems-gperf.gperf',
         output : 'filesystems-gperf.h',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -266,7 +258,6 @@ filesystems_gperf_h = custom_target(
 generate_filesystem_list = find_program('generate-filesystem-list.py')
 fname = 'filesystem-list.inc'
 filesystem_list_inc = custom_target(
-        fname,
         input : 'filesystems-gperf.gperf',
         output : fname,
         command : [generate_filesystem_list,
@@ -276,7 +267,6 @@ filesystem_list_inc = custom_target(
 generate_filesystem_switch_case_inc = find_program('generate-filesystem-switch-case.py')
 fname = 'filesystem-switch-case.inc'
 filesystem_switch_case_inc = custom_target(
-        fname,
         input : 'filesystems-gperf.gperf',
         output : fname,
         command : [generate_filesystem_switch_case_inc,

diff --git a/src/boot/meson.build b/src/boot/meson.build
index dffd5db88eafd93362e8504cab5c1a9eac5b5425..4064bbe3b78836c69a279c867253a10795e62b22 100644 (file)
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -31,7 +31,6 @@ generate_hwids_section_py = find_program('generate-hwids-section.py')
 
 if conf.get('ENABLE_UKIFY') == 1
         test_hwids_section_c = custom_target(
-                'test-hwids-section.c',
                 input : ['hwids/device1.json', 'hwids/device2.json', 'hwids/device3.json', 'hwids/device4.json'],
                 output : 'test-hwids-section.c',
                 command : [generate_hwids_section_py, meson.current_source_dir()/'hwids'],
@@ -443,7 +442,6 @@ foreach efi_elf_binary : efi_elf_binaries
         endif
 
         exe = custom_target(
-                name,
                 output : name,
                 input : efi_elf_binary,
                 install : true,

diff --git a/src/core/bpf/restrict_fs/meson.build b/src/core/bpf/restrict_fs/meson.build
index 4dcc21f1b43083c3ad9c4ff52ab8a3920d610465..41fc130acebe0a1b9063f00612b198340df62157 100644 (file)
--- a/src/core/bpf/restrict_fs/meson.build
+++ b/src/core/bpf/restrict_fs/meson.build
@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
 endif
 
 restrict_fs_bpf_o_unstripped = custom_target(
-        'restrict-fs.bpf.unstripped.o',
         input : 'restrict-fs.bpf.c',
         output : 'restrict-fs.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd)
 
 restrict_fs_bpf_o = custom_target(
-        'restrict-fs.bpf.o',
         input : restrict_fs_bpf_o_unstripped,
         output : 'restrict-fs.bpf.o',
         command : bpf_o_cmd)
 
 restrict_fs_skel_h = custom_target(
-        'restrict-fs.skel.h',
         input : restrict_fs_bpf_o,
         output : 'restrict-fs.skel.h',
         command : skel_h_cmd,

diff --git a/src/core/bpf/restrict_ifaces/meson.build b/src/core/bpf/restrict_ifaces/meson.build
index 4ed8a981bb8a73cd61c1d61d1dfe78b9754dce60..f9ef4c753e4ffb82f53e9034151545cfaefec511 100644 (file)
--- a/src/core/bpf/restrict_ifaces/meson.build
+++ b/src/core/bpf/restrict_ifaces/meson.build
@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
 endif
 
 restrict_ifaces_bpf_o_unstripped = custom_target(
-        'restrict-ifaces.bpf.unstripped.o',
         input : 'restrict-ifaces.bpf.c',
         output : 'restrict-ifaces.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd)
 
 restrict_ifaces_bpf_o = custom_target(
-        'restrict-ifaces.bpf.o',
         input : restrict_ifaces_bpf_o_unstripped,
         output : 'restrict-ifaces.bpf.o',
         command : bpf_o_cmd)
 
 restrict_ifaces_skel_h = custom_target(
-        'restrict-ifaces.skel.h',
         input : restrict_ifaces_bpf_o,
         output : 'restrict-ifaces.skel.h',
         command : skel_h_cmd,

diff --git a/src/core/bpf/socket_bind/meson.build b/src/core/bpf/socket_bind/meson.build
index ec845906a776d85709745529c70f87ebc0ae2f3a..ec9d34637b3aba8c69735917b5740fb4dba92027 100644 (file)
--- a/src/core/bpf/socket_bind/meson.build
+++ b/src/core/bpf/socket_bind/meson.build
@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
 endif
 
 socket_bind_bpf_o_unstripped = custom_target(
-        'socket-bind.bpf.unstripped.o',
         input : 'socket-bind.bpf.c',
         output : 'socket-bind.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd)
 
 socket_bind_bpf_o = custom_target(
-        'socket-bind.bpf.o',
         input : socket_bind_bpf_o_unstripped,
         output : 'socket-bind.bpf.o',
         command : bpf_o_cmd)
 
 socket_bind_skel_h = custom_target(
-        'socket-bind.skel.h',
         input : socket_bind_bpf_o,
         output : 'socket-bind.skel.h',
         command : skel_h_cmd,

diff --git a/src/core/meson.build b/src/core/meson.build
index db44e7b80ea1d7cf3b98f7a6404882cd058cbb3c..a515704a1f8ff1bcac376093d673da9d76cf8390 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -84,20 +84,17 @@ endif
 sources += libcore_sources
 
 load_fragment_gperf_gperf = custom_target(
-        'load-fragment-gperf.gperf',
         input : 'load-fragment-gperf.gperf.in',
         output: 'load-fragment-gperf.gperf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'])
 
 load_fragment_gperf_c = custom_target(
-        'load-fragment-gperf.c',
         input : load_fragment_gperf_gperf,
         output : 'load-fragment-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 awkscript = 'load-fragment-gperf-nulstr.awk'
 load_fragment_gperf_nulstr_c = custom_target(
-        'load-fragment-gperf-nulstr.c',
         input : [awkscript, load_fragment_gperf_gperf],
         output : 'load-fragment-gperf-nulstr.c',
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -234,7 +231,6 @@ foreach item : in_files
         dir = item[1]
 
         custom_target(
-                file,
                 input : file + '.in',
                 output: file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -243,7 +239,6 @@ foreach item : in_files
 endforeach
 
 systemd_pc = custom_target(
-        'systemd.pc',
         input : 'systemd.pc.in',
         output : 'systemd.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/home/meson.build b/src/home/meson.build
index 94c26ef08821d81f9fa1efc978073b071ba1c870..1937e6f56c80d003e266bb434bb82e81c6678dd0 100644 (file)
--- a/src/home/meson.build
+++ b/src/home/meson.build
@@ -37,7 +37,6 @@ systemd_homework_sources = files(
 )
 
 homed_gperf_c = custom_target(
-        'homed-gperf.c',
         input : 'homed-gperf.gperf',
         output : 'homed-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 036b40a3b65d8756620e747dc3a76c1b753c5bbd..496220201b1f3af044e7a4e501498833451dfa24 100644 (file)
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -88,7 +88,6 @@ in_files = [
 foreach tuple : in_files
         file = tuple[0]
         custom_target(
-                file,
                 input : file + '.in',
                 output: file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/journal/meson.build b/src/journal/meson.build
index cbce43fc546b715d449712c59cae6735b9f9ee3a..e5da683b3800a5ecba6b0cd39458c1bc6bf0b9d7 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -24,7 +24,6 @@ systemd_journald_extract_sources = files(
 )
 
 journald_gperf_c = custom_target(
-        'journald-gperf.c',
         input : 'journald-gperf.gperf',
         output : 'journald-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
index edd0b7d360d14b6b87bcbc69427ce6caaf7adaf4..1724a710555763323d6a9dcd02d2a6f1a3decb41 100644 (file)
--- a/src/kernel-install/meson.build
+++ b/src/kernel-install/meson.build
@@ -12,7 +12,6 @@ executables += [
 ]
 
 ukify_install = custom_target(
-        '60-ukify.install',
         input : '60-ukify.install.in',
         output : '60-ukify.install',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -21,7 +20,6 @@ ukify_install = custom_target(
         install_dir : kernelinstalldir)
 
 loaderentry_install = custom_target(
-        '90-loaderentry.install',
         input : '90-loaderentry.install.in',
         output : '90-loaderentry.install',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 57fc116929a9999e6455def3b374136cf0ac67e9..52c6cea3c58310597526a823d4644ded5da67e26 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -163,7 +163,6 @@ static_libsystemd = get_option('static-libsystemd')
 static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
 
 libsystemd_pc = custom_target(
-        'libsystemd.pc',
         input : 'libsystemd.pc.in',
         output : 'libsystemd.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/libsystemd/sd-journal/meson.build b/src/libsystemd/sd-journal/meson.build
index 1cc715c86c05f9239d005ecfc40e8ccb4b3d01ed..0f8a101d89f418c06213039ecd68f3427b443745 100644 (file)
--- a/src/libsystemd/sd-journal/meson.build
+++ b/src/libsystemd/sd-journal/meson.build
@@ -14,13 +14,11 @@
 
 generate_audit_type_list = find_program('generate-audit_type-list.sh')
 audit_type_list_txt = custom_target(
-        'audit_type-list.txt',
         output : 'audit_type-list.txt',
         command : [generate_audit_type_list, cpp, missing_audit_h],
         capture : true)
 
 audit_type_to_name = custom_target(
-        'audit_type-to-name.inc',
         input : ['audit_type-to-name.awk', audit_type_list_txt],
         output : 'audit_type-to-name.inc',
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],

diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 43959640b9f346b1e2179629bb57965e06d5adde..eb9dda79ae2fcde577564f1be90320288fa0c031 100644 (file)
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -38,7 +38,6 @@ static_libudev = get_option('static-libudev')
 static_libudev_pic = static_libudev == 'true' or static_libudev == 'pic'
 
 libudev_pc = custom_target(
-        'libudev.pc',
         input : 'libudev.pc.in',
         output : 'libudev.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/login/meson.build b/src/login/meson.build
index 17bc65957ffd71bb3f6ad9090b3812105e6c34a8..01d01195671a87a78130e1d084fbd78b25fd7b5f 100644 (file)
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -29,7 +29,6 @@ systemd_logind_extract_sources = files(
 )
 
 logind_gperf_c = custom_target(
-        'logind-gperf.c',
         input : 'logind-gperf.gperf',
         output : 'logind-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -108,7 +107,6 @@ modules += [
 ]
 
 custom_target(
-        'logind.conf',
         input : 'logind.conf.in',
         output : 'logind.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -116,7 +114,6 @@ custom_target(
         install_dir : pkgconfigfiledir)
 
 custom_target(
-        'systemd-user',
         input : 'systemd-user.in',
         output : 'systemd-user',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/network/bpf/sysctl_monitor/meson.build b/src/network/bpf/sysctl_monitor/meson.build
index c3ae52a473fc12f290a9bff7f3cf3800d4231204..2cd385736a620bc683ae9fe4d7ca72e7f0ad0fc7 100644 (file)
--- a/src/network/bpf/sysctl_monitor/meson.build
+++ b/src/network/bpf/sysctl_monitor/meson.build
@@ -5,20 +5,17 @@ if conf.get('HAVE_VMLINUX_H') != 1
 endif
 
 sysctl_monitor_bpf_o_unstripped = custom_target(
-        'sysctl-monitor.bpf.unstripped.o',
         input : 'sysctl-monitor.bpf.c',
         output : 'sysctl-monitor.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd,
         depends : vmlinux_h_dependency)
 
 sysctl_monitor_bpf_o = custom_target(
-        'sysctl-monitor.bpf.o',
         input : sysctl_monitor_bpf_o_unstripped,
         output : 'sysctl-monitor.bpf.o',
         command : bpf_o_cmd)
 
 sysctl_monitor_skel_h = custom_target(
-        'sysctl-monitor.skel.h',
         input : sysctl_monitor_bpf_o,
         output : 'sysctl-monitor.skel.h',
         command : skel_h_cmd,

diff --git a/src/network/meson.build b/src/network/meson.build
index 70c5a09bb20cee40a60ea49b280953eebbd61bac..0c8dd46a673b32e557ae74202c182f7cd1c8f387 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -145,19 +145,16 @@ if conf.get('HAVE_VMLINUX_H') == 1
 endif
 
 networkd_gperf_c = custom_target(
-        'networkd-gperf.c',
         input : 'networkd-gperf.gperf',
         output : 'networkd-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 networkd_network_gperf_c = custom_target(
-        'networkd-network-gperf.c',
         input : networkd_network_gperf_gperf,
         output : 'networkd-network-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 netdev_gperf_c = custom_target(
-        'netdev-gperf.c',
         input : networkd_netdev_gperf_gperf,
         output : 'netdev-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index 29fec248dfeea889741992d531af2f618373cbf3..f49ccc71edee9c5f6f6e730055fe4f841c0a83a3 100644 (file)
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -22,7 +22,6 @@ nspawn_extract_sources = files(
 )
 
 nspawn_gperf_c = custom_target(
-        'nspawn-gperf.c',
         input : 'nspawn-gperf.gperf',
         output : 'nspawn-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

diff --git a/src/nsresourced/bpf/userns_restrict/meson.build b/src/nsresourced/bpf/userns_restrict/meson.build
index a62e34dad28a36705ac2e33b33c6c6730ff09b25..e6bcc51add313ed46d6bef9ffd361ff74dd8e86e 100644 (file)
--- a/src/nsresourced/bpf/userns_restrict/meson.build
+++ b/src/nsresourced/bpf/userns_restrict/meson.build
@@ -5,20 +5,17 @@ if conf.get('HAVE_VMLINUX_H') != 1
 endif
 
 userns_restrict_bpf_o_unstripped = custom_target(
-        'userns-restrict.bpf.unstripped.o',
         input : 'userns-restrict.bpf.c',
         output : 'userns-restrict.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd,
         depends : vmlinux_h_dependency)
 
 userns_restrict_bpf_o = custom_target(
-        'userns-restrict.bpf.o',
         input : userns_restrict_bpf_o_unstripped,
         output : 'userns-restrict.bpf.o',
         command : bpf_o_cmd)
 
 userns_restrict_skel_h = custom_target(
-        'userns-restrict.skel.h',
         input : userns_restrict_bpf_o,
         output : 'userns-restrict.skel.h',
         command : skel_h_cmd,

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 5312eaece96e6594298b78bdc8ece9bb14a468d9..23dc79da5bc75ef750f56dd0b5ddcf568ae8d460 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -46,7 +46,6 @@ systemd_resolved_extract_sources = files(
 ############################################################
 
 dns_type_list_txt = custom_target(
-        'dns_type-list.txt',
         input : ['generate-dns_type-list.sed', 'dns-type.h'],
         output : 'dns_type-list.txt',
         command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'],
@@ -55,14 +54,12 @@ dns_type_list_txt = custom_target(
 generate_dns_type_gperf = find_program('generate-dns_type-gperf.py')
 
 gperf_file = custom_target(
-        'dns_type-from-name.gperf',
         input : dns_type_list_txt,
         output : 'dns_type-from-name.gperf',
         command : [generate_dns_type_gperf, 'dns_type', 'DNS_TYPE_', '@INPUT@'],
         capture : true)
 
 dns_type_from_name_inc = custom_target(
-        'dns_type-from-name.inc',
         input : gperf_file,
         output : 'dns_type-from-name.inc',
         command : [gperf,
@@ -74,26 +71,22 @@ dns_type_from_name_inc = custom_target(
         capture : true)
 
 dns_type_to_name_inc = custom_target(
-        'dns_type-to-name.inc',
         input : ['dns_type-to-name.awk', dns_type_list_txt],
         output : 'dns_type-to-name.inc',
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
         capture : true)
 
 resolved_gperf_c = custom_target(
-        'resolved-gperf.c',
         input : 'resolved-gperf.gperf',
         output : 'resolved-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 resolved_dnssd_gperf_c = custom_target(
-        'resolved-dnssd-gperf.c',
         input : 'resolved-dnssd-gperf.gperf',
         output : 'resolved-dnssd-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 resolved_dns_delegate_gperf_c = custom_target(
-        'resolved-dns-delegate-gperf.c',
         input : 'resolved-dns-delegate-gperf.gperf',
         output : 'resolved-dns-delegate-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -228,7 +221,6 @@ install_symlink('systemd-resolve',
                 install_dir : bindir)
 
 custom_target(
-        'resolved.conf',
         input : 'resolved.conf.in',
         output : 'resolved.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/rpm/meson.build b/src/rpm/meson.build
index af39ff145ab95d1f87a3e8c11e0437a8eea19904..ffb57bf45d4a46374885bce142548068ccbf2df0 100644 (file)
--- a/src/rpm/meson.build
+++ b/src/rpm/meson.build
@@ -15,7 +15,6 @@ in_files = [
 foreach tuple : in_files
         file = tuple[0]
         custom_target(
-                file,
                 input : file + '.in',
                 output : file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/run/meson.build b/src/run/meson.build
index a228d2501444dcf26c2603123232bfe812252442..af9d7a04e19ca92d3a33b7a972993be3bee255f2 100644 (file)
--- a/src/run/meson.build
+++ b/src/run/meson.build
@@ -13,7 +13,6 @@ install_symlink('run0',
                 install_dir : bindir)
 
 custom_target(
-        'systemd-run0',
         input : 'systemd-run0.in',
         output : 'systemd-run0',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 2336e6a7df7cb3faa3742436262644a8bb105428..78e435de350c338677d87b5a3c2b14de48f86f15 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -233,7 +233,6 @@ endif
 generate_syscall_list = find_program('generate-syscall-list.py')
 fname = 'syscall-list.inc'
 syscall_list_inc = custom_target(
-        fname,
         input : syscall_list_txt,
         output : fname,
         command : [generate_syscall_list,
@@ -261,14 +260,12 @@ endif
 
 generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh')
 ip_protocol_list_txt = custom_target(
-        'ip-protocol-list.txt',
         output : 'ip-protocol-list.txt',
         command : [generate_ip_protocol_list, cpp],
         capture : true)
 
 fname = 'ip-protocol-from-name.gperf'
 gperf_file = custom_target(
-        fname,
         input : ip_protocol_list_txt,
         output : fname,
         command : [generate_gperfs, 'ip_protocol', 'IPPROTO_', '@INPUT@', '<netinet/in.h>'],
@@ -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 e36f9fae08cdb2b610f209e31bb88152ff1cec25..b14ef46ff5aabbd992eb9d68f09b1387a11a0582 100644 (file)
--- 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 0ccc9332cdf235d3446b6454d40e0f3e38bb120f..e8e4a663d2df066e99f93360fd4f64fe567343d3 100644 (file)
--- 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 608589e4b846601354c2e3823c0d46f439eac9bd..c7694de6abfa43e03f8d264afcbb86742fc35daf 100644 (file)
--- 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 7d994ad5d0c75e550c062082791ddf937e403f23..34fc42747830c9ee1bbc8eb8f0047f4f2c985937 100644 (file)
--- 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 57948d8df99e5a737cdc7109d62a81399284a180..4bb8ac17a69e0529687f7b61326de77818520f71 100644 (file)
--- 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 909baa2be31ad32a24803e923380fad7d2d95436..10cbd553aa2cfac9e87f0547ea7e427078a4c918 100644 (file)
--- 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 4402b1006b186cc1b909bc10bfb60d675dd8f599..84fadfe3f7020eb2db210b7e0c87574a2dcd89e4 100644 (file)
--- 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 54115909a24ec9cfa2d048ae07f8cb63d5107dfc..48d962b520da04fdf8b44debb5cedcd100c91f5c 100644 (file)
--- 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 db58a9817a1b6ea65f7a15fd51506aa3d42f4656..203eb7bb5527726d5a0ae3c8eb96d615c6911ecf 100644 (file)
--- 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 a8b004056233fcf632d4e404539b1ae0a7f82c8f..8a3ce203a10cbf4f742a66e3b0b2e58babccac90 100644 (file)
--- 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@'],