From 87d7b110d6ed6d4ef0b61e777f2fee3c10808f0b Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Thu, 14 Apr 2022 13:50:55 +0200 Subject: Introduce an `include` directory for header files Move all header files to the new `include` directory. Adapt include directives and build systems to the new directory. Change-Id: Iaddd6bbfa0624b166d422f665877f096983bf4cf Signed-off-by: Felix Singer Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/58622 Tested-by: build bot (Jenkins) Reviewed-by: Anastasia Klimchuk --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index f8ca1d3d..32e31df3 100644 --- a/meson.build +++ b/meson.build @@ -379,10 +379,12 @@ libdir = join_paths(prefix, get_option('libdir')) mandir = join_paths(prefix, get_option('mandir')) install_headers([ - 'libflashrom.h', + 'include/libflashrom.h', ], ) +include_dir = include_directories('include') + # core modules needed by both the library and the CLI srcs += '82802ab.c' srcs += 'at45db.c' @@ -423,6 +425,7 @@ flashrom = library( sources : [ srcs, ], + include_directories : include_dir, soversion : lt_current, version : lt_version, dependencies : [ @@ -466,7 +469,7 @@ configure_file( flashrom_dep = declare_dependency( link_with : flashrom, - include_directories : include_directories('.'), + include_directories : include_dir, dependencies : deps ) @@ -493,6 +496,7 @@ executable( 'cli_output.c', 'flashrom.c', ], + include_directories : include_dir, dependencies : [ deps, ], @@ -512,7 +516,7 @@ cmocka_dep = dependency( required: false ) flashrom_test_dep = declare_dependency( - include_directories : include_directories('.'), + include_directories : include_dir, sources : [ srcs, 'cli_common.c', -- cgit v1.2.3