1
0
mirror of https://github.com/systemd/systemd synced 2025-10-05 16:03:15 +02:00

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
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-06-28 17:14:50 +02:00
parent e11041d30f
commit 7d247d3cb8
41 changed files with 1 additions and 107 deletions

View File

@@ -25,7 +25,6 @@ support_sed = 's~%SUPPORT_URL%~@0@~'.format(support_url)
foreach file : in_files foreach file : in_files
catalogs += custom_target( catalogs += custom_target(
file,
input : file + '.in', input : file + '.in',
output: file, output: file,
command : [sed, support_sed, '@INPUT@'], command : [sed, support_sed, '@INPUT@'],

View File

@@ -1,7 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1-or-later # SPDX-License-Identifier: LGPL-2.1-or-later
custom_target( custom_target(
'README',
input : 'README.in', input : 'README.in',
output : 'README', output : 'README',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -3,7 +3,6 @@
factory_etc_dir = factorydir / 'etc' factory_etc_dir = factorydir / 'etc'
custom_target( custom_target(
'locale.conf',
input : 'locale.conf.in', input : 'locale.conf.in',
output : 'locale.conf', output : 'locale.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -11,7 +10,6 @@ custom_target(
install_dir : factory_etc_dir) install_dir : factory_etc_dir)
custom_target( custom_target(
'vconsole.conf',
input : 'vconsole.conf.in', input : 'vconsole.conf.in',
output : 'vconsole.conf', output : 'vconsole.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -41,7 +41,6 @@ hwdb_files_test = files(
if conf.get('ENABLE_HWDB') == 1 if conf.get('ENABLE_HWDB') == 1
auto_suspend_rules = custom_target( auto_suspend_rules = custom_target(
'60-autosuspend-chromiumos.hwdb',
output : '60-autosuspend-chromiumos.hwdb', output : '60-autosuspend-chromiumos.hwdb',
command : make_autosuspend_rules_py, command : make_autosuspend_rules_py,
capture : true, capture : true,

View File

@@ -29,7 +29,6 @@ custom_html_xsl = files('custom-html.xsl')
xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags
custom_entities_ent = custom_target( custom_entities_ent = custom_target(
'custom-entities.ent',
input : 'custom-entities.ent.in', input : 'custom-entities.ent.in',
output : 'custom-entities.ent', output : 'custom-entities.ent',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@']) command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'])
@@ -76,7 +75,6 @@ foreach tuple : manpages
if xsltproc.found() if xsltproc.found()
p1 = custom_target( p1 = custom_target(
man,
input : xml, input : xml,
output : [man] + manaliases, output : [man] + manaliases,
command : xslt_cmd + [custom_man_xsl, '@INPUT@'], command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
@@ -88,7 +86,6 @@ foreach tuple : manpages
p2 = [] p2 = []
foreach htmlalias : htmlaliases foreach htmlalias : htmlaliases
link = custom_target( link = custom_target(
htmlalias,
output : htmlalias, output : htmlalias,
command : [ln, '-fs', html, '@OUTPUT@']) command : [ln, '-fs', html, '@OUTPUT@'])
if want_html if want_html
@@ -101,7 +98,6 @@ foreach tuple : manpages
endforeach endforeach
p3 = custom_target( p3 = custom_target(
html,
input : xml, input : xml,
output : html, output : html,
command : xslt_cmd + [custom_html_xsl, '@INPUT@'], command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
@@ -123,7 +119,6 @@ if not have_lxml
endif endif
systemd_directives_xml = custom_target( systemd_directives_xml = custom_target(
'systemd.directives.xml',
input : ['directives-template.xml', source_xml_files], input : ['directives-template.xml', source_xml_files],
output : 'systemd.directives.xml', output : 'systemd.directives.xml',
depends : man_page_depends, depends : man_page_depends,
@@ -131,7 +126,6 @@ systemd_directives_xml = custom_target(
nonindex_xml_files = source_xml_files + [systemd_directives_xml] nonindex_xml_files = source_xml_files + [systemd_directives_xml]
systemd_index_xml = custom_target( systemd_index_xml = custom_target(
'systemd.index.xml',
input : nonindex_xml_files, input : nonindex_xml_files,
output : 'systemd.index.xml', output : 'systemd.index.xml',
command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files) 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) mandirn = get_option('mandir') / ('man' + section)
p1 = custom_target( p1 = custom_target(
man,
input : xml, input : xml,
output : man, output : man,
command : xslt_cmd + [custom_man_xsl, '@INPUT@'], 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' if html == 'systemd.index.html'
htmlalias = 'index.html' htmlalias = 'index.html'
link = custom_target( link = custom_target(
htmlalias,
input : p2, input : p2,
output : htmlalias, output : htmlalias,
command : [ln, '-fs', html, '@OUTPUT@']) command : [ln, '-fs', html, '@OUTPUT@'])
@@ -174,7 +166,6 @@ foreach tuple : xsltproc.found() and have_lxml ? [['systemd.directives', '7', sy
endif endif
p3 = custom_target( p3 = custom_target(
html,
input : xml, input : xml,
output : html, output : html,
command : xslt_cmd + [custom_html_xsl, '@INPUT@'], command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
@@ -187,13 +178,11 @@ endforeach
# Cannot use run_target because those targets are used in depends # Cannot use run_target because those targets are used in depends
# Also see https://github.com/mesonbuild/meson/issues/368. # Also see https://github.com/mesonbuild/meson/issues/368.
man = custom_target( man = custom_target(
'man',
output : 'man', output : 'man',
depends : man_pages, depends : man_pages,
command : [echo]) command : [echo])
html = custom_target( html = custom_target(
'html',
output : 'html', output : 'html',
depends : html_pages, depends : html_pages,
command : [echo]) command : [echo])

View File

@@ -1919,7 +1919,6 @@ if use_provided_vmlinux_h
message('Using provided @0@'.format(provided_vmlinux_h_path)) message('Using provided @0@'.format(provided_vmlinux_h_path))
elif use_generated_vmlinux_h elif use_generated_vmlinux_h
vmlinux_h_dependency = custom_target( vmlinux_h_dependency = custom_target(
'vmlinux.h',
output: 'vmlinux.h', output: 'vmlinux.h',
command : [ bpftool, 'btf', 'dump', 'file', '/sys/kernel/btf/vmlinux', 'format', 'c' ], command : [ bpftool, 'btf', 'dump', 'file', '/sys/kernel/btf/vmlinux', 'format', 'c' ],
capture : true) capture : true)
@@ -2143,7 +2142,6 @@ endif
##################################################################### #####################################################################
runtest_env = custom_target( runtest_env = custom_target(
'systemd-runtest.env',
output : 'systemd-runtest.env', output : 'systemd-runtest.env',
command : ['printf', command : ['printf',
'SYSTEMD_TEST_DATA=%q\nSYSTEMD_CATALOG_DIR=%q\n', 'SYSTEMD_TEST_DATA=%q\nSYSTEMD_CATALOG_DIR=%q\n',
@@ -2647,7 +2645,6 @@ foreach executable : ['systemd-measure', 'systemd-sbsign', 'systemd-keyutil']
endforeach endforeach
ukify = custom_target( ukify = custom_target(
'ukify',
input : 'src/ukify/ukify.py', input : 'src/ukify/ukify.py',
output : 'ukify', output : 'ukify',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -2797,7 +2794,6 @@ if git.found()
all_files = files(all_files.stdout().split()) all_files = files(all_files.stdout().split())
custom_target( custom_target(
'tags',
output : 'tags', output : 'tags',
command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.project_source_root())] + all_files) command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.project_source_root())] + all_files)
run_target( run_target(
@@ -2887,7 +2883,7 @@ if not meson.is_cross_build()
endif endif
meson_extract_unit_files = find_program('tools/meson-extract-unit-files.py') 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', output : 'installed-unit-files.txt',
capture : true, capture : true,
install : want_tests != 'no' and install_tests, install : want_tests != 'no' and install_tests,

View File

@@ -76,7 +76,6 @@ foreach tuple : rules_in
want = tuple.length() == 1 or tuple[1] want = tuple.length() == 1 or tuple[1]
rule = custom_target( rule = custom_target(
tuple[0],
input : tuple[0] + '.in', input : tuple[0] + '.in',
output: tuple[0], output: tuple[0],
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -11,7 +11,6 @@ if bashcompletiondir == ''
endif endif
custom_target( custom_target(
'systemctl',
input : 'systemctl.in', input : 'systemctl.in',
output : 'systemctl', output : 'systemctl',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -6,7 +6,6 @@ if zshcompletiondir == ''
endif endif
custom_target( custom_target(
'_systemctl',
input : '_systemctl.in', input : '_systemctl.in',
output : '_systemctl', output : '_systemctl',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -126,28 +126,24 @@ basic_sources += missing_syscall_def_h
generate_af_list = find_program('generate-af-list.sh') generate_af_list = find_program('generate-af-list.sh')
af_list_txt = custom_target( af_list_txt = custom_target(
'af-list.txt',
output : 'af-list.txt', output : 'af-list.txt',
command : [generate_af_list, cpp, files('missing_socket.h')], command : [generate_af_list, cpp, files('missing_socket.h')],
capture : true) capture : true)
generate_arphrd_list = find_program('generate-arphrd-list.sh') generate_arphrd_list = find_program('generate-arphrd-list.sh')
arphrd_list_txt = custom_target( arphrd_list_txt = custom_target(
'arphrd-list.txt',
output : 'arphrd-list.txt', output : 'arphrd-list.txt',
command : [generate_arphrd_list, cpp, files('include/linux/if_arp.h')], command : [generate_arphrd_list, cpp, files('include/linux/if_arp.h')],
capture : true) capture : true)
generate_cap_list = find_program('generate-cap-list.sh') generate_cap_list = find_program('generate-cap-list.sh')
cap_list_txt = custom_target( cap_list_txt = custom_target(
'cap-list.txt',
output : 'cap-list.txt', output : 'cap-list.txt',
command : [generate_cap_list, cpp, files('include/linux/capability.h')], command : [generate_cap_list, cpp, files('include/linux/capability.h')],
capture : true) capture : true)
generate_errno_list = find_program('generate-errno-list.sh') generate_errno_list = find_program('generate-errno-list.sh')
errno_list_txt = custom_target( errno_list_txt = custom_target(
'errno-list.txt',
output : 'errno-list.txt', output : 'errno-list.txt',
command : [generate_errno_list, cpp], command : [generate_errno_list, cpp],
capture : true) capture : true)
@@ -160,7 +156,6 @@ foreach item : [['af', af_list_txt, 'af', '', ['<sys/sock
fname = '@0@-from-name.gperf'.format(item[0]) fname = '@0@-from-name.gperf'.format(item[0])
gperf_file = custom_target( gperf_file = custom_target(
fname,
input : item[1], input : item[1],
output : fname, output : fname,
command : [generate_gperfs, item[2], item[3], '@INPUT@'] + item[4], 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]) fname = '@0@-from-name.inc'.format(item[0])
target1 = custom_target( target1 = custom_target(
fname,
input : gperf_file, input : gperf_file,
output : fname, output : fname,
command : [gperf, command : [gperf,
@@ -182,7 +176,6 @@ foreach item : [['af', af_list_txt, 'af', '', ['<sys/sock
fname = '@0@-to-name.inc'.format(item[0]) fname = '@0@-to-name.inc'.format(item[0])
awkscript = '@0@-to-name.awk'.format(item[0]) awkscript = '@0@-to-name.awk'.format(item[0])
target2 = custom_target( target2 = custom_target(
fname,
input : [awkscript, item[1]], input : [awkscript, item[1]],
output : fname, output : fname,
command : [awk, '-f', '@INPUT0@', '@INPUT1@'], command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -258,7 +251,6 @@ if r.returncode() != 0
endif endif
filesystems_gperf_h = custom_target( filesystems_gperf_h = custom_target(
'filesystems-gperf.h',
input : 'filesystems-gperf.gperf', input : 'filesystems-gperf.gperf',
output : 'filesystems-gperf.h', output : 'filesystems-gperf.h',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -266,7 +258,6 @@ filesystems_gperf_h = custom_target(
generate_filesystem_list = find_program('generate-filesystem-list.py') generate_filesystem_list = find_program('generate-filesystem-list.py')
fname = 'filesystem-list.inc' fname = 'filesystem-list.inc'
filesystem_list_inc = custom_target( filesystem_list_inc = custom_target(
fname,
input : 'filesystems-gperf.gperf', input : 'filesystems-gperf.gperf',
output : fname, output : fname,
command : [generate_filesystem_list, 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') generate_filesystem_switch_case_inc = find_program('generate-filesystem-switch-case.py')
fname = 'filesystem-switch-case.inc' fname = 'filesystem-switch-case.inc'
filesystem_switch_case_inc = custom_target( filesystem_switch_case_inc = custom_target(
fname,
input : 'filesystems-gperf.gperf', input : 'filesystems-gperf.gperf',
output : fname, output : fname,
command : [generate_filesystem_switch_case_inc, command : [generate_filesystem_switch_case_inc,

View File

@@ -31,7 +31,6 @@ generate_hwids_section_py = find_program('generate-hwids-section.py')
if conf.get('ENABLE_UKIFY') == 1 if conf.get('ENABLE_UKIFY') == 1
test_hwids_section_c = custom_target( test_hwids_section_c = custom_target(
'test-hwids-section.c',
input : ['hwids/device1.json', 'hwids/device2.json', 'hwids/device3.json', 'hwids/device4.json'], input : ['hwids/device1.json', 'hwids/device2.json', 'hwids/device3.json', 'hwids/device4.json'],
output : 'test-hwids-section.c', output : 'test-hwids-section.c',
command : [generate_hwids_section_py, meson.current_source_dir()/'hwids'], command : [generate_hwids_section_py, meson.current_source_dir()/'hwids'],
@@ -443,7 +442,6 @@ foreach efi_elf_binary : efi_elf_binaries
endif endif
exe = custom_target( exe = custom_target(
name,
output : name, output : name,
input : efi_elf_binary, input : efi_elf_binary,
install : true, install : true,

View File

@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
endif endif
restrict_fs_bpf_o_unstripped = custom_target( restrict_fs_bpf_o_unstripped = custom_target(
'restrict-fs.bpf.unstripped.o',
input : 'restrict-fs.bpf.c', input : 'restrict-fs.bpf.c',
output : 'restrict-fs.bpf.unstripped.o', output : 'restrict-fs.bpf.unstripped.o',
command : bpf_o_unstripped_cmd) command : bpf_o_unstripped_cmd)
restrict_fs_bpf_o = custom_target( restrict_fs_bpf_o = custom_target(
'restrict-fs.bpf.o',
input : restrict_fs_bpf_o_unstripped, input : restrict_fs_bpf_o_unstripped,
output : 'restrict-fs.bpf.o', output : 'restrict-fs.bpf.o',
command : bpf_o_cmd) command : bpf_o_cmd)
restrict_fs_skel_h = custom_target( restrict_fs_skel_h = custom_target(
'restrict-fs.skel.h',
input : restrict_fs_bpf_o, input : restrict_fs_bpf_o,
output : 'restrict-fs.skel.h', output : 'restrict-fs.skel.h',
command : skel_h_cmd, command : skel_h_cmd,

View File

@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
endif endif
restrict_ifaces_bpf_o_unstripped = custom_target( restrict_ifaces_bpf_o_unstripped = custom_target(
'restrict-ifaces.bpf.unstripped.o',
input : 'restrict-ifaces.bpf.c', input : 'restrict-ifaces.bpf.c',
output : 'restrict-ifaces.bpf.unstripped.o', output : 'restrict-ifaces.bpf.unstripped.o',
command : bpf_o_unstripped_cmd) command : bpf_o_unstripped_cmd)
restrict_ifaces_bpf_o = custom_target( restrict_ifaces_bpf_o = custom_target(
'restrict-ifaces.bpf.o',
input : restrict_ifaces_bpf_o_unstripped, input : restrict_ifaces_bpf_o_unstripped,
output : 'restrict-ifaces.bpf.o', output : 'restrict-ifaces.bpf.o',
command : bpf_o_cmd) command : bpf_o_cmd)
restrict_ifaces_skel_h = custom_target( restrict_ifaces_skel_h = custom_target(
'restrict-ifaces.skel.h',
input : restrict_ifaces_bpf_o, input : restrict_ifaces_bpf_o,
output : 'restrict-ifaces.skel.h', output : 'restrict-ifaces.skel.h',
command : skel_h_cmd, command : skel_h_cmd,

View File

@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
endif endif
socket_bind_bpf_o_unstripped = custom_target( socket_bind_bpf_o_unstripped = custom_target(
'socket-bind.bpf.unstripped.o',
input : 'socket-bind.bpf.c', input : 'socket-bind.bpf.c',
output : 'socket-bind.bpf.unstripped.o', output : 'socket-bind.bpf.unstripped.o',
command : bpf_o_unstripped_cmd) command : bpf_o_unstripped_cmd)
socket_bind_bpf_o = custom_target( socket_bind_bpf_o = custom_target(
'socket-bind.bpf.o',
input : socket_bind_bpf_o_unstripped, input : socket_bind_bpf_o_unstripped,
output : 'socket-bind.bpf.o', output : 'socket-bind.bpf.o',
command : bpf_o_cmd) command : bpf_o_cmd)
socket_bind_skel_h = custom_target( socket_bind_skel_h = custom_target(
'socket-bind.skel.h',
input : socket_bind_bpf_o, input : socket_bind_bpf_o,
output : 'socket-bind.skel.h', output : 'socket-bind.skel.h',
command : skel_h_cmd, command : skel_h_cmd,

View File

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

View File

@@ -37,7 +37,6 @@ systemd_homework_sources = files(
) )
homed_gperf_c = custom_target( homed_gperf_c = custom_target(
'homed-gperf.c',
input : 'homed-gperf.gperf', input : 'homed-gperf.gperf',
output : 'homed-gperf.c', output : 'homed-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

View File

@@ -88,7 +88,6 @@ in_files = [
foreach tuple : in_files foreach tuple : in_files
file = tuple[0] file = tuple[0]
custom_target( custom_target(
file,
input : file + '.in', input : file + '.in',
output: file, output: file,
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -24,7 +24,6 @@ systemd_journald_extract_sources = files(
) )
journald_gperf_c = custom_target( journald_gperf_c = custom_target(
'journald-gperf.c',
input : 'journald-gperf.gperf', input : 'journald-gperf.gperf',
output : 'journald-gperf.c', output : 'journald-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

View File

@@ -12,7 +12,6 @@ executables += [
] ]
ukify_install = custom_target( ukify_install = custom_target(
'60-ukify.install',
input : '60-ukify.install.in', input : '60-ukify.install.in',
output : '60-ukify.install', output : '60-ukify.install',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -21,7 +20,6 @@ ukify_install = custom_target(
install_dir : kernelinstalldir) install_dir : kernelinstalldir)
loaderentry_install = custom_target( loaderentry_install = custom_target(
'90-loaderentry.install',
input : '90-loaderentry.install.in', input : '90-loaderentry.install.in',
output : '90-loaderentry.install', output : '90-loaderentry.install',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -163,7 +163,6 @@ static_libsystemd = get_option('static-libsystemd')
static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic' static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
libsystemd_pc = custom_target( libsystemd_pc = custom_target(
'libsystemd.pc',
input : 'libsystemd.pc.in', input : 'libsystemd.pc.in',
output : 'libsystemd.pc', output : 'libsystemd.pc',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -14,13 +14,11 @@
generate_audit_type_list = find_program('generate-audit_type-list.sh') generate_audit_type_list = find_program('generate-audit_type-list.sh')
audit_type_list_txt = custom_target( audit_type_list_txt = custom_target(
'audit_type-list.txt',
output : 'audit_type-list.txt', output : 'audit_type-list.txt',
command : [generate_audit_type_list, cpp, missing_audit_h], command : [generate_audit_type_list, cpp, missing_audit_h],
capture : true) capture : true)
audit_type_to_name = custom_target( audit_type_to_name = custom_target(
'audit_type-to-name.inc',
input : ['audit_type-to-name.awk', audit_type_list_txt], input : ['audit_type-to-name.awk', audit_type_list_txt],
output : 'audit_type-to-name.inc', output : 'audit_type-to-name.inc',
command : [awk, '-f', '@INPUT0@', '@INPUT1@'], command : [awk, '-f', '@INPUT0@', '@INPUT1@'],

View File

@@ -38,7 +38,6 @@ static_libudev = get_option('static-libudev')
static_libudev_pic = static_libudev == 'true' or static_libudev == 'pic' static_libudev_pic = static_libudev == 'true' or static_libudev == 'pic'
libudev_pc = custom_target( libudev_pc = custom_target(
'libudev.pc',
input : 'libudev.pc.in', input : 'libudev.pc.in',
output : 'libudev.pc', output : 'libudev.pc',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -29,7 +29,6 @@ systemd_logind_extract_sources = files(
) )
logind_gperf_c = custom_target( logind_gperf_c = custom_target(
'logind-gperf.c',
input : 'logind-gperf.gperf', input : 'logind-gperf.gperf',
output : 'logind-gperf.c', output : 'logind-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -108,7 +107,6 @@ modules += [
] ]
custom_target( custom_target(
'logind.conf',
input : 'logind.conf.in', input : 'logind.conf.in',
output : 'logind.conf', output : 'logind.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -116,7 +114,6 @@ custom_target(
install_dir : pkgconfigfiledir) install_dir : pkgconfigfiledir)
custom_target( custom_target(
'systemd-user',
input : 'systemd-user.in', input : 'systemd-user.in',
output : 'systemd-user', output : 'systemd-user',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -5,20 +5,17 @@ if conf.get('HAVE_VMLINUX_H') != 1
endif endif
sysctl_monitor_bpf_o_unstripped = custom_target( sysctl_monitor_bpf_o_unstripped = custom_target(
'sysctl-monitor.bpf.unstripped.o',
input : 'sysctl-monitor.bpf.c', input : 'sysctl-monitor.bpf.c',
output : 'sysctl-monitor.bpf.unstripped.o', output : 'sysctl-monitor.bpf.unstripped.o',
command : bpf_o_unstripped_cmd, command : bpf_o_unstripped_cmd,
depends : vmlinux_h_dependency) depends : vmlinux_h_dependency)
sysctl_monitor_bpf_o = custom_target( sysctl_monitor_bpf_o = custom_target(
'sysctl-monitor.bpf.o',
input : sysctl_monitor_bpf_o_unstripped, input : sysctl_monitor_bpf_o_unstripped,
output : 'sysctl-monitor.bpf.o', output : 'sysctl-monitor.bpf.o',
command : bpf_o_cmd) command : bpf_o_cmd)
sysctl_monitor_skel_h = custom_target( sysctl_monitor_skel_h = custom_target(
'sysctl-monitor.skel.h',
input : sysctl_monitor_bpf_o, input : sysctl_monitor_bpf_o,
output : 'sysctl-monitor.skel.h', output : 'sysctl-monitor.skel.h',
command : skel_h_cmd, command : skel_h_cmd,

View File

@@ -145,19 +145,16 @@ if conf.get('HAVE_VMLINUX_H') == 1
endif endif
networkd_gperf_c = custom_target( networkd_gperf_c = custom_target(
'networkd-gperf.c',
input : 'networkd-gperf.gperf', input : 'networkd-gperf.gperf',
output : 'networkd-gperf.c', output : 'networkd-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
networkd_network_gperf_c = custom_target( networkd_network_gperf_c = custom_target(
'networkd-network-gperf.c',
input : networkd_network_gperf_gperf, input : networkd_network_gperf_gperf,
output : 'networkd-network-gperf.c', output : 'networkd-network-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
netdev_gperf_c = custom_target( netdev_gperf_c = custom_target(
'netdev-gperf.c',
input : networkd_netdev_gperf_gperf, input : networkd_netdev_gperf_gperf,
output : 'netdev-gperf.c', output : 'netdev-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

View File

@@ -22,7 +22,6 @@ nspawn_extract_sources = files(
) )
nspawn_gperf_c = custom_target( nspawn_gperf_c = custom_target(
'nspawn-gperf.c',
input : 'nspawn-gperf.gperf', input : 'nspawn-gperf.gperf',
output : 'nspawn-gperf.c', output : 'nspawn-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])

View File

@@ -5,20 +5,17 @@ if conf.get('HAVE_VMLINUX_H') != 1
endif endif
userns_restrict_bpf_o_unstripped = custom_target( userns_restrict_bpf_o_unstripped = custom_target(
'userns-restrict.bpf.unstripped.o',
input : 'userns-restrict.bpf.c', input : 'userns-restrict.bpf.c',
output : 'userns-restrict.bpf.unstripped.o', output : 'userns-restrict.bpf.unstripped.o',
command : bpf_o_unstripped_cmd, command : bpf_o_unstripped_cmd,
depends : vmlinux_h_dependency) depends : vmlinux_h_dependency)
userns_restrict_bpf_o = custom_target( userns_restrict_bpf_o = custom_target(
'userns-restrict.bpf.o',
input : userns_restrict_bpf_o_unstripped, input : userns_restrict_bpf_o_unstripped,
output : 'userns-restrict.bpf.o', output : 'userns-restrict.bpf.o',
command : bpf_o_cmd) command : bpf_o_cmd)
userns_restrict_skel_h = custom_target( userns_restrict_skel_h = custom_target(
'userns-restrict.skel.h',
input : userns_restrict_bpf_o, input : userns_restrict_bpf_o,
output : 'userns-restrict.skel.h', output : 'userns-restrict.skel.h',
command : skel_h_cmd, command : skel_h_cmd,

View File

@@ -46,7 +46,6 @@ systemd_resolved_extract_sources = files(
############################################################ ############################################################
dns_type_list_txt = custom_target( dns_type_list_txt = custom_target(
'dns_type-list.txt',
input : ['generate-dns_type-list.sed', 'dns-type.h'], input : ['generate-dns_type-list.sed', 'dns-type.h'],
output : 'dns_type-list.txt', output : 'dns_type-list.txt',
command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'], 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') generate_dns_type_gperf = find_program('generate-dns_type-gperf.py')
gperf_file = custom_target( gperf_file = custom_target(
'dns_type-from-name.gperf',
input : dns_type_list_txt, input : dns_type_list_txt,
output : 'dns_type-from-name.gperf', output : 'dns_type-from-name.gperf',
command : [generate_dns_type_gperf, 'dns_type', 'DNS_TYPE_', '@INPUT@'], command : [generate_dns_type_gperf, 'dns_type', 'DNS_TYPE_', '@INPUT@'],
capture : true) capture : true)
dns_type_from_name_inc = custom_target( dns_type_from_name_inc = custom_target(
'dns_type-from-name.inc',
input : gperf_file, input : gperf_file,
output : 'dns_type-from-name.inc', output : 'dns_type-from-name.inc',
command : [gperf, command : [gperf,
@@ -74,26 +71,22 @@ dns_type_from_name_inc = custom_target(
capture : true) capture : true)
dns_type_to_name_inc = custom_target( dns_type_to_name_inc = custom_target(
'dns_type-to-name.inc',
input : ['dns_type-to-name.awk', dns_type_list_txt], input : ['dns_type-to-name.awk', dns_type_list_txt],
output : 'dns_type-to-name.inc', output : 'dns_type-to-name.inc',
command : [awk, '-f', '@INPUT0@', '@INPUT1@'], command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
capture : true) capture : true)
resolved_gperf_c = custom_target( resolved_gperf_c = custom_target(
'resolved-gperf.c',
input : 'resolved-gperf.gperf', input : 'resolved-gperf.gperf',
output : 'resolved-gperf.c', output : 'resolved-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
resolved_dnssd_gperf_c = custom_target( resolved_dnssd_gperf_c = custom_target(
'resolved-dnssd-gperf.c',
input : 'resolved-dnssd-gperf.gperf', input : 'resolved-dnssd-gperf.gperf',
output : 'resolved-dnssd-gperf.c', output : 'resolved-dnssd-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
resolved_dns_delegate_gperf_c = custom_target( resolved_dns_delegate_gperf_c = custom_target(
'resolved-dns-delegate-gperf.c',
input : 'resolved-dns-delegate-gperf.gperf', input : 'resolved-dns-delegate-gperf.gperf',
output : 'resolved-dns-delegate-gperf.c', output : 'resolved-dns-delegate-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -228,7 +221,6 @@ install_symlink('systemd-resolve',
install_dir : bindir) install_dir : bindir)
custom_target( custom_target(
'resolved.conf',
input : 'resolved.conf.in', input : 'resolved.conf.in',
output : 'resolved.conf', output : 'resolved.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -15,7 +15,6 @@ in_files = [
foreach tuple : in_files foreach tuple : in_files
file = tuple[0] file = tuple[0]
custom_target( custom_target(
file,
input : file + '.in', input : file + '.in',
output : file, output : file,
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -13,7 +13,6 @@ install_symlink('run0',
install_dir : bindir) install_dir : bindir)
custom_target( custom_target(
'systemd-run0',
input : 'systemd-run0.in', input : 'systemd-run0.in',
output : 'systemd-run0', output : 'systemd-run0',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -233,7 +233,6 @@ endif
generate_syscall_list = find_program('generate-syscall-list.py') generate_syscall_list = find_program('generate-syscall-list.py')
fname = 'syscall-list.inc' fname = 'syscall-list.inc'
syscall_list_inc = custom_target( syscall_list_inc = custom_target(
fname,
input : syscall_list_txt, input : syscall_list_txt,
output : fname, output : fname,
command : [generate_syscall_list, command : [generate_syscall_list,
@@ -261,14 +260,12 @@ endif
generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh') generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh')
ip_protocol_list_txt = custom_target( ip_protocol_list_txt = custom_target(
'ip-protocol-list.txt',
output : 'ip-protocol-list.txt', output : 'ip-protocol-list.txt',
command : [generate_ip_protocol_list, cpp], command : [generate_ip_protocol_list, cpp],
capture : true) capture : true)
fname = 'ip-protocol-from-name.gperf' fname = 'ip-protocol-from-name.gperf'
gperf_file = custom_target( gperf_file = custom_target(
fname,
input : ip_protocol_list_txt, input : ip_protocol_list_txt,
output : fname, output : fname,
command : [generate_gperfs, 'ip_protocol', 'IPPROTO_', '@INPUT@', '<netinet/in.h>'], command : [generate_gperfs, 'ip_protocol', 'IPPROTO_', '@INPUT@', '<netinet/in.h>'],
@@ -276,7 +273,6 @@ gperf_file = custom_target(
fname = 'ip-protocol-from-name.inc' fname = 'ip-protocol-from-name.inc'
target1 = custom_target( target1 = custom_target(
fname,
input : gperf_file, input : gperf_file,
output : fname, output : fname,
command : [gperf, command : [gperf,
@@ -290,7 +286,6 @@ target1 = custom_target(
fname = 'ip-protocol-to-name.inc' fname = 'ip-protocol-to-name.inc'
awkscript = 'ip-protocol-to-name.awk' awkscript = 'ip-protocol-to-name.awk'
target2 = custom_target( target2 = custom_target(
fname,
input : [awkscript, ip_protocol_list_txt], input : [awkscript, ip_protocol_list_txt],
output : fname, output : fname,
command : [awk, '-f', '@INPUT0@', '@INPUT1@'], command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -301,7 +296,6 @@ shared_sources += [target1, target2]
fname = 'ethtool-link-mode.inc' fname = 'ethtool-link-mode.inc'
ethtool_link_mode_inc = custom_target( ethtool_link_mode_inc = custom_target(
fname,
input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'], input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'],
output : fname, output : fname,
command : [python, '@INPUT0@', '--header', cpp, '@INPUT1@'], command : [python, '@INPUT0@', '--header', cpp, '@INPUT1@'],
@@ -313,7 +307,6 @@ sources += shared_sources
fname = 'ethtool-link-mode.xml' fname = 'ethtool-link-mode.xml'
ethtool_link_mode_xml = custom_target( ethtool_link_mode_xml = custom_target(
fname,
input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'], input : ['ethtool-link-mode.py', '../basic/include/linux/ethtool.h'],
output : fname, output : fname,
command : [python, '@INPUT0@', '--xml', cpp, '@INPUT1@'], command : [python, '@INPUT0@', '--xml', cpp, '@INPUT1@'],

View File

@@ -13,7 +13,6 @@ executables += [
if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1 if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1
custom_target( custom_target(
'20-systemd-ssh-proxy.conf',
input : '20-systemd-ssh-proxy.conf.in', input : '20-systemd-ssh-proxy.conf.in',
output : '20-systemd-ssh-proxy.conf', output : '20-systemd-ssh-proxy.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -2,7 +2,6 @@
awkscript = 'test-hashmap-ordered.awk' awkscript = 'test-hashmap-ordered.awk'
test_hashmap_ordered_c = custom_target( test_hashmap_ordered_c = custom_target(
'test-hashmap-ordered.c',
input : [awkscript, 'test-hashmap-plain.c'], input : [awkscript, 'test-hashmap-plain.c'],
output : 'test-hashmap-ordered.c', output : 'test-hashmap-ordered.c',
command : [awk, '-f', '@INPUT0@', '@INPUT1@'], command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -28,7 +27,6 @@ endif
generate_sym_test_py = find_program('generate-sym-test.py') generate_sym_test_py = find_program('generate-sym-test.py')
test_libsystemd_sym_c = custom_target( test_libsystemd_sym_c = custom_target(
'test-libsystemd-sym.c',
input : [libsystemd_sym_path] + systemd_headers + libsystemd_sources, input : [libsystemd_sym_path] + systemd_headers + libsystemd_sources,
output : 'test-libsystemd-sym.c', output : 'test-libsystemd-sym.c',
command : [generate_sym_test_py, libsystemd_sym_path, libsystemd_dir_path] + systemd_headers, 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') build_by_default : want_tests != 'false')
test_libudev_sym_c = custom_target( test_libudev_sym_c = custom_target(
'test-libudev-sym.c',
input : [libudev_sym_path, libudev_h_path] + libudev_sources, input : [libudev_sym_path, libudev_h_path] + libudev_sources,
output : 'test-libudev-sym.c', output : 'test-libudev-sym.c',
command : [generate_sym_test_py, libudev_sym_path, libudev_dir_path, libudev_h_path], command : [generate_sym_test_py, libudev_sym_path, libudev_dir_path, libudev_h_path],

View File

@@ -15,7 +15,6 @@ timesyncd_extract_sources = files(
) )
timesyncd_gperf_c = custom_target( timesyncd_gperf_c = custom_target(
'timesyncd-gperf.c',
input : 'timesyncd-gperf.gperf', input : 'timesyncd-gperf.gperf',
output : 'timesyncd-gperf.c', output : 'timesyncd-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -56,7 +55,6 @@ executables += [
] ]
custom_target( custom_target(
'timesyncd.conf',
input : 'timesyncd.conf.in', input : 'timesyncd.conf.in',
output : 'timesyncd.conf', output : 'timesyncd.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -63,7 +63,6 @@ endif
generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh') generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh')
keyboard_keys_list_txt = custom_target( keyboard_keys_list_txt = custom_target(
'keyboard-keys-list.txt',
input : files('../basic/include/linux/input.h'), input : files('../basic/include/linux/input.h'),
output : 'keyboard-keys-list.txt', output : 'keyboard-keys-list.txt',
command : [generate_keyboard_keys_list, cpp, '@INPUT@'], 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') generate_keyboard_keys_gperf = find_program('generate-keyboard-keys-gperf.sh')
fname = 'keyboard-keys-from-name.gperf' fname = 'keyboard-keys-from-name.gperf'
gperf_file = custom_target( gperf_file = custom_target(
fname,
input : keyboard_keys_list_txt, input : keyboard_keys_list_txt,
output : fname, output : fname,
command : [generate_keyboard_keys_gperf, '@INPUT@'], command : [generate_keyboard_keys_gperf, '@INPUT@'],
@@ -80,7 +78,6 @@ gperf_file = custom_target(
fname = 'keyboard-keys-from-name.inc' fname = 'keyboard-keys-from-name.inc'
keyboard_keys_from_name_inc = custom_target( keyboard_keys_from_name_inc = custom_target(
fname,
input : gperf_file, input : gperf_file,
output : fname, output : fname,
command : [gperf, command : [gperf,
@@ -98,7 +95,6 @@ generated_sources += keyboard_keys_from_name_inc
udev_link_gperf_gperf = files('net/link-config-gperf.gperf') udev_link_gperf_gperf = files('net/link-config-gperf.gperf')
link_config_gperf_c = custom_target( link_config_gperf_c = custom_target(
'link-config-gperf.c',
input : udev_link_gperf_gperf, input : udev_link_gperf_gperf,
output : 'link-config-gperf.c', output : 'link-config-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -277,7 +273,6 @@ if install_sysconfdir_samples
endif endif
udev_pc = custom_target( udev_pc = custom_target(
'udev.pc',
input : 'udev.pc.in', input : 'udev.pc.in',
output : 'udev.pc', output : 'udev.pc',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -26,7 +26,6 @@ executables += [
if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1 if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
custom_target( custom_target(
'20-systemd-userdb.conf',
input : '20-systemd-userdb.conf.in', input : '20-systemd-userdb.conf.in',
output : '20-systemd-userdb.conf', output : '20-systemd-userdb.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -13,7 +13,6 @@ if cc.sizeof('long') > 4
endif endif
custom_target( custom_target(
'50-coredump.conf',
input : '50-coredump.conf.in', input : '50-coredump.conf.in',
output : '50-coredump.conf', output : '50-coredump.conf',
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -20,7 +20,6 @@ in_files = [['basic.conf', true],
foreach tuple : in_files foreach tuple : in_files
file = tuple[0] file = tuple[0]
custom_target( custom_target(
file,
input : file + '.in', input : file + '.in',
output: file, output: file,
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -11,7 +11,6 @@ directives = [['fuzz-network-parser', 'directives.network', networkd_network_gpe
foreach tuple : directives foreach tuple : directives
directive = custom_target( directive = custom_target(
tuple[1],
output: tuple[1], output: tuple[1],
command: [generate_directives_py, tuple[2]], command: [generate_directives_py, tuple[2]],
capture: true) capture: true)
@@ -26,7 +25,6 @@ foreach section : ['Automount', 'Mount', 'Path', 'Scope', 'Service', 'Slice', 'S
sec_rx = section == 'Service' ? '(Service|Unit|Install)' : section sec_rx = section == 'Service' ? '(Service|Unit|Install)' : section
name = 'directives.@0@'.format(unit_type) name = 'directives.@0@'.format(unit_type)
unit_directives += custom_target( unit_directives += custom_target(
name,
output: name, output: name,
command: [generate_directives_py, load_fragment_gperf_gperf, sec_rx, unit_type], command: [generate_directives_py, load_fragment_gperf_gperf, sec_rx, unit_type],
capture: true) capture: true)

View File

@@ -45,7 +45,6 @@ in_files = [
foreach f : in_files foreach f : in_files
if f.length() == 1 or conf.get(f[1]) == 1 if f.length() == 1 or conf.get(f[1]) == 1
custom_target( custom_target(
f[0],
input : f[0] + '.in', input : f[0] + '.in',
output: f[0], output: f[0],
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],

View File

@@ -929,7 +929,6 @@ foreach unit : units
if needs_jinja if needs_jinja
t = custom_target( t = custom_target(
name,
input : source, input : source,
output : name, output : name,
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],