Thomas Heijligen has submitted this change. ( 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 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 --- M meson.build 1 file changed, 13 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved
diff --git a/meson.build b/meson.build index 3742a1d..30ebb88 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',
3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.