Attention is currently required from: Felix Singer. Hello Felix Singer,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/flashrom/+/58305
to review the following change.
Change subject: [POC]meson: Move header files ......................................................................
[POC]meson: Move header files
Change-Id: Ia01bfda6b467d75b0266924a4fd1b290b6c59119 Signed-off-by: Nico Huber nico.huber@secunet.com --- R include/flash.h M meson.build M util/ich_descriptors_tool/meson.build 3 files changed, 16 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/05/58305/1
diff --git a/flash.h b/include/flash.h similarity index 100% rename from flash.h rename to include/flash.h diff --git a/meson.build b/meson.build index 1a36df8..b9d6704 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,8 @@ '-Wno-missing-braces', ]
+includes = include_directories('include') + conf = configuration_data()
cc = meson.get_compiler('c') @@ -380,6 +382,9 @@ sources : [ srcs, ], + include_directories : [ + includes, + ], soversion : lt_current, version : lt_version, dependencies : [ @@ -450,6 +455,9 @@ 'cli_output.c', 'flashrom.c', ], + include_directories : [ + includes, + ], dependencies : [ deps, ], @@ -469,13 +477,16 @@ required: false ) flashrom_test_dep = declare_dependency( - include_directories : include_directories('.'), sources : [ srcs, 'cli_common.c', 'cli_output.c', 'flashrom.c', ], + include_directories : [ + includes, + '.', + ], compile_args : [ '-includestdlib.h', '-includeunittest_env.h', diff --git a/util/ich_descriptors_tool/meson.build b/util/ich_descriptors_tool/meson.build index b5bf09e..75ef5a9 100644 --- a/util/ich_descriptors_tool/meson.build +++ b/util/ich_descriptors_tool/meson.build @@ -7,7 +7,10 @@ dependencies : [ deps, ], - include_directories : include_directories('../..'), + include_directories : [ + includes, + '../..', + ], c_args : [ '-DICH_DESCRIPTORS_FROM_DUMP_ONLY', ],