Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/64029 )
Change subject: meson: relocate config_print_wiki & config_default_programmer_* ......................................................................
meson: relocate config_print_wiki & config_default_programmer_*
Change-Id: I9538b0aee31b294844d4f4ca0396334a81dfb498 Signed-off-by: Thomas Heijligen thomas.heijligen@secunet.com --- M meson.build 1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/29/64029/1
diff --git a/meson.build b/meson.build index cfb353f..3018c17 100644 --- a/meson.build +++ b/meson.build @@ -403,6 +403,19 @@ 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 @@ 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',