Unflatten edk includes
Installing the edk headers into a folder requires us to do odd things
with imports, and either include headers with "..", or otherwise get the
include directories lined up.
Move the contents of edk/*.c/h up a level, and just simplify the include
structure. This is done to fix the immediate change of the prior patch
and make this build again. Happy to discuss other options.
Change-Id: I328f20bca6d23100993493445bee0e5e11d2866a
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/meson.build b/meson.build
index f85ae36..acfb2d0 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,7 @@
'sections/cper-section.c',
)
-edk_sources = files('edk/Cper.c')
+edk_sources = files('Cper.c')
generator_section_sources = files(
'generator/sections/gen-section-ampere.c',
@@ -137,12 +137,14 @@
'cper-parse-str.h',
'cper-utils.h',
'common-utils.h',
+ 'Cper.h',
+ 'Cper.c',
+ 'BaseTypes.h',
subdir: 'libcper',
preserve_path : true
)
install_headers('generator/cper-generate.h', subdir: 'libcper/generator')
-install_headers('edk/Cper.h', 'edk/BaseTypes.h', subdir: 'libcper/edk')
if get_option('utility').allowed()
executable(