diff options
author | Thomas Heijligen <thomas.heijligen@secunet.com> | 2022-05-03 12:00:14 +0200 |
---|---|---|
committer | Thomas Heijligen <src@posteo.de> | 2022-05-12 08:53:41 +0000 |
commit | 963aaf55b37aec55087608afbfd5728201a2bc6a (patch) | |
tree | 049022b20473485dcc601409b2f9cecfbbd953f9 | |
parent | 688eb58204223dbc2c5a3680cd45d5fd3374bd17 (diff) | |
download | flashrom-963aaf55b37aec55087608afbfd5728201a2bc6a.tar.gz flashrom-963aaf55b37aec55087608afbfd5728201a2bc6a.tar.bz2 flashrom-963aaf55b37aec55087608afbfd5728201a2bc6a.zip |
meson: relocate config_print_wiki & config_default_programmer_*
Change-Id: I9538b0aee31b294844d4f4ca0396334a81dfb498
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/64029
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
-rw-r--r-- | meson.build | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meson.build b/meson.build index 3742a1d6..30ebb886 100644 --- a/meson.build +++ b/meson.build @@ -403,6 +403,19 @@ if need_serial endif endif +if config_print_wiki + srcs += 'print_wiki.c' + cargs += '-DCONFIG_PRINT_WIKI=1' +endif + +if config_default_programmer_name != '' + cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_' + config_default_programmer_name +else + cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=NULL' +endif + +cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS="' + config_default_programmer_args + '"' + install_headers([ 'include/libflashrom.h', ], @@ -465,19 +478,6 @@ flashrom_dep = declare_dependency( dependencies : deps ) -if config_print_wiki - srcs += 'print_wiki.c' - cargs += '-DCONFIG_PRINT_WIKI=1' -endif - -if config_default_programmer_name != '' - cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=&programmer_' + config_default_programmer_name -else - cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=NULL' -endif - -cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS="' + config_default_programmer_args + '"' - # we can't just link_with libflashrom as we require all the internal symbols... executable( 'flashrom', |