mirror of
https://github.com/postgres/postgres.git
synced 2026-05-26 11:15:54 -04:00
meson: Differentiate top-level and custom targets
We need to create top-level targets to run targets with the ninja command like `ninja <target_name>`. Some targets (man, html, ...) have the same target name on both top-level and custom target. This creates a confusion for the meson build: $ meson compile -C build html ``` ERROR: Can't invoke target `html`: ambiguous name. Add target type and/or path: - ./doc/src/sgml/html:custom - ./doc/src/sgml/html:alias ``` Solve that problem by adding '-custom' suffix to these problematic targets' custom target names. Top-level targets can be called with both meson and ninja now: $ meson compile -C build html $ ninja -C build html Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Suggested-by: Álvaro Herrera <alvherre@kurilemu.de> Discussion: https://postgr.es/m/5508e572-79ae-4b20-84d0-010a66d077f2%40eisentraut.org
This commit is contained in:
parent
9d2979dd68
commit
3b28dad70e
1 changed files with 4 additions and 4 deletions
|
|
@ -137,7 +137,7 @@ endif
|
|||
# Full documentation as html, text
|
||||
#
|
||||
if docs_dep.found()
|
||||
html = custom_target('html',
|
||||
html = custom_target('html-custom',
|
||||
input: ['stylesheet.xsl', postgres_full_xml],
|
||||
output: 'html',
|
||||
depfile: 'html.d',
|
||||
|
|
@ -146,7 +146,7 @@ if docs_dep.found()
|
|||
)
|
||||
alldocs += html
|
||||
|
||||
install_doc_html = custom_target('install-html',
|
||||
install_doc_html = custom_target('install-html-custom',
|
||||
output: 'install-html',
|
||||
command: [
|
||||
python, install_files, '--prefix', dir_prefix,
|
||||
|
|
@ -189,7 +189,7 @@ endif
|
|||
#
|
||||
if docs_dep.found()
|
||||
# FIXME: implement / consider sqlmansectnum logic
|
||||
man = custom_target('man',
|
||||
man = custom_target('man-custom',
|
||||
input: ['stylesheet-man.xsl', postgres_full_xml],
|
||||
output: ['man1', 'man3', 'man7'],
|
||||
depfile: 'man.d',
|
||||
|
|
@ -198,7 +198,7 @@ if docs_dep.found()
|
|||
)
|
||||
alldocs += man
|
||||
|
||||
install_doc_man = custom_target('install-man',
|
||||
install_doc_man = custom_target('install-man-custom',
|
||||
output: 'install-man',
|
||||
input: man,
|
||||
command: [
|
||||
|
|
|
|||
Loading…
Reference in a new issue