Change include style to use system includes
The libcper header files in `libcper` are installed to
`usr/include/libcper`. Use that system includes in `libcper` source
instead of using the project includes.
Change-Id: I596edc2c754dae4829844f535a1e34caa246fb43
Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
diff --git a/Cper.c b/Cper.c
index a4d5713..8f94155 100644
--- a/Cper.c
+++ b/Cper.c
@@ -13,7 +13,7 @@
/**
* Extern definitions for EFI GUIDs relating to notification types and error section types.
**/
-#include "Cper.h"
+#include <libcper/Cper.h>
//Event notification type GUIDs.
EFI_GUID gEfiEventNotificationTypeCmcGuid = { 0x2DCE8BB1,
diff --git a/base64.c b/base64.c
index 723d9d3..38ea0ab 100644
--- a/base64.c
+++ b/base64.c
@@ -1,5 +1,5 @@
-#include "base64.h"
-#include "BaseTypes.h"
+#include <libcper/base64.h>
+#include <libcper/BaseTypes.h>
#include <stdlib.h>
#include <string.h>
diff --git a/cli-app/cper-convert.c b/cli-app/cper-convert.c
index 5ff748b..c2a73e4 100644
--- a/cli-app/cper-convert.c
+++ b/cli-app/cper-convert.c
@@ -10,8 +10,8 @@
#include <libgen.h>
#include <limits.h>
#include <json.h>
-#include "../cper-parse.h"
-#include "../json-schema.h"
+#include <libcper/cper-parse.h>
+#include <libcper/json-schema.h>
void cper_to_json(char *in_file, char *out_file, int is_single_section);
void json_to_cper(char *in_file, char *out_file, char *specification_file,
diff --git a/common-utils.c b/common-utils.c
index c26f046..7d85b58 100644
--- a/common-utils.c
+++ b/common-utils.c
@@ -5,8 +5,8 @@
* Author: Lawrence.Tang@arm.com
**/
-#include "BaseTypes.h"
-#include "common-utils.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/common-utils.h>
//Converts the given BCD byte to a standard integer.
int bcd_to_int(UINT8 bcd)
diff --git a/cper-parse.c b/cper-parse.c
index 91de189..0eaebe4 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -8,12 +8,12 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "cper-parse.h"
-#include "cper-parse-str.h"
-#include "cper-utils.h"
-#include "sections/cper-section.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-parse.h>
+#include <libcper/cper-parse-str.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section.h>
//Private pre-definitions.
json_object *cper_header_to_ir(EFI_COMMON_ERROR_RECORD_HEADER *header);
diff --git a/cper-parse.i b/cper-parse.i
index e783e7d..45c8d3a 100644
--- a/cper-parse.i
+++ b/cper-parse.i
@@ -1,6 +1,6 @@
% module cperparse %
{
-#include "cper-parse.h"
+#include <libcper/cper-parse.h>
#include <json.h>
#include <stdio.h>
%
diff --git a/cper-utils.c b/cper-utils.c
index 94fe08e..7008020 100644
--- a/cper-utils.c
+++ b/cper-utils.c
@@ -6,8 +6,8 @@
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "cper-utils.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
//The available severity types for CPER.
const char *CPER_SEVERITY_TYPES[4] = { "Recoverable", "Fatal", "Corrected",
diff --git a/docs/GeneratorExtensions.md b/docs/GeneratorExtensions.md
index 683646d..b9f7068 100644
--- a/docs/GeneratorExtensions.md
+++ b/docs/GeneratorExtensions.md
@@ -79,7 +79,7 @@
*
* Author: Lawrence.Tang@arm.com
**/
-#include "gen-section.h"
+#include <libcper/generator/sections/gen-section.h>
CPER_GENERATOR_DEFINITION generator_definitions[] = {
...
diff --git a/docs/OEMExtensions.md b/docs/OEMExtensions.md
index b734b41..10e5d89 100644
--- a/docs/OEMExtensions.md
+++ b/docs/OEMExtensions.md
@@ -19,7 +19,7 @@
#define CPER_SECTION_MYVENDOR
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
json_object* cper_section_myvendor_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor);
void ir_section_myvendor_to_cper(json_object* section, FILE* out);
@@ -38,8 +38,8 @@
**/
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "cper-section-ccix-per.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-section-ccix-per.h>
json_object* cper_section_myvendor_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor)
{
@@ -97,8 +97,8 @@
*
* Author: Lawrence.Tang@arm.com
**/
-#include "Cper.h"
-#include "cper-section.h"
+#include <libcper/Cper.h>
+#include <libcper/sections/cper-section.h>
...
#include "cper-section-myvendor.h"
diff --git a/generator/cper-generate-cli.c b/generator/cper-generate-cli.c
index b0bf14d..c9882c2 100644
--- a/generator/cper-generate-cli.c
+++ b/generator/cper-generate-cli.c
@@ -7,9 +7,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "Cper.h"
-#include "cper-generate.h"
-#include "sections/gen-section.h"
+#include <libcper/Cper.h>
+#include <libcper/generator/cper-generate.h>
+#include <libcper/generator/sections/gen-section.h>
void print_help();
diff --git a/generator/cper-generate.c b/generator/cper-generate.c
index 58f14a3..91eaf41 100644
--- a/generator/cper-generate.c
+++ b/generator/cper-generate.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "Cper.h"
-#include "gen-utils.h"
-#include "sections/gen-section.h"
-#include "cper-generate.h"
+#include <libcper/Cper.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
+#include <libcper/generator/cper-generate.h>
EFI_ERROR_SECTION_DESCRIPTOR *generate_section_descriptor(char *type,
const size_t *lengths,
diff --git a/generator/gen-utils.c b/generator/gen-utils.c
index e69f0b5..03f6b8d 100644
--- a/generator/gen-utils.c
+++ b/generator/gen-utils.c
@@ -5,8 +5,8 @@
**/
#include <stdlib.h>
#include <time.h>
-#include "BaseTypes.h"
-#include "gen-utils.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
//Generates a random section of the given byte size, saving the result to the given location.
//Returns the length of the section as passed in.
diff --git a/generator/sections/gen-section-ampere.c b/generator/sections/gen-section-ampere.c
index 90c521c..3ffe2f5 100644
--- a/generator/sections/gen-section-ampere.c
+++ b/generator/sections/gen-section-ampere.c
@@ -6,9 +6,9 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random Ampere error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-arm.c b/generator/sections/gen-section-arm.c
index c98bf84..5043741 100644
--- a/generator/sections/gen-section-arm.c
+++ b/generator/sections/gen-section-arm.c
@@ -6,9 +6,9 @@
#include <stdlib.h>
#include <string.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
#define ARM_ERROR_INFO_SIZE 32
void *generate_arm_error_info();
diff --git a/generator/sections/gen-section-ccix-per.c b/generator/sections/gen-section-ccix-per.c
index 7323427..0784d34 100644
--- a/generator/sections/gen-section-ccix-per.c
+++ b/generator/sections/gen-section-ccix-per.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random CCIX PER error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-cxl-component.c b/generator/sections/gen-section-cxl-component.c
index 6d702b4..395defb 100644
--- a/generator/sections/gen-section-cxl-component.c
+++ b/generator/sections/gen-section-cxl-component.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random CXL component error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-cxl-protocol.c b/generator/sections/gen-section-cxl-protocol.c
index 424366d..5139005 100644
--- a/generator/sections/gen-section-cxl-protocol.c
+++ b/generator/sections/gen-section-cxl-protocol.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random CXL protocol error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-dmar.c b/generator/sections/gen-section-dmar.c
index e0ac603..dc34696 100644
--- a/generator/sections/gen-section-dmar.c
+++ b/generator/sections/gen-section-dmar.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random generic DMAr error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-firmware.c b/generator/sections/gen-section-firmware.c
index dd2d69d..e482a6b 100644
--- a/generator/sections/gen-section-firmware.c
+++ b/generator/sections/gen-section-firmware.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random firmware error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-generic.c b/generator/sections/gen-section-generic.c
index 02e2ee5..41c315f 100644
--- a/generator/sections/gen-section-generic.c
+++ b/generator/sections/gen-section-generic.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random generic processor section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-ia32x64.c b/generator/sections/gen-section-ia32x64.c
index e1fb60d..5415f02 100644
--- a/generator/sections/gen-section-ia32x64.c
+++ b/generator/sections/gen-section-ia32x64.c
@@ -6,9 +6,9 @@
#include <stdlib.h>
#include <string.h>
-#include "../../Cper.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/Cper.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
#define IA32X64_ERROR_STRUCTURE_SIZE 64
void *generate_ia32x64_error_structure();
diff --git a/generator/sections/gen-section-memory.c b/generator/sections/gen-section-memory.c
index b573dbd..475d6d0 100644
--- a/generator/sections/gen-section-memory.c
+++ b/generator/sections/gen-section-memory.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random platform memory error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-nvidia.c b/generator/sections/gen-section-nvidia.c
index a505089..3d2b706 100644
--- a/generator/sections/gen-section-nvidia.c
+++ b/generator/sections/gen-section-nvidia.c
@@ -7,9 +7,9 @@
#include <stddef.h>
#include <string.h>
#include <stdio.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random NVIDIA error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-pci-bus.c b/generator/sections/gen-section-pci-bus.c
index decfb53..1e424bf 100644
--- a/generator/sections/gen-section-pci-bus.c
+++ b/generator/sections/gen-section-pci-bus.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random PCI/PCI-X bus error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-pci-dev.c b/generator/sections/gen-section-pci-dev.c
index 58ae95e..999739a 100644
--- a/generator/sections/gen-section-pci-dev.c
+++ b/generator/sections/gen-section-pci-dev.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
//Generates a single pseudo-random PCI component error section, saving the resulting address to the given
//location. Returns the size of the newly created section.
diff --git a/generator/sections/gen-section-pcie.c b/generator/sections/gen-section-pcie.c
index 611ef62..1e1beb7 100644
--- a/generator/sections/gen-section-pcie.c
+++ b/generator/sections/gen-section-pcie.c
@@ -5,9 +5,9 @@
**/
#include <stdlib.h>
-#include "../../BaseTypes.h"
-#include "../gen-utils.h"
-#include "gen-section.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/gen-utils.h>
+#include <libcper/generator/sections/gen-section.h>
#define PCIE_PORT_TYPES \
(int[]) \
diff --git a/generator/sections/gen-section.c b/generator/sections/gen-section.c
index 56b6d84..a5ae40b 100644
--- a/generator/sections/gen-section.c
+++ b/generator/sections/gen-section.c
@@ -3,7 +3,7 @@
*
* Author: Lawrence.Tang@arm.com
**/
-#include "gen-section.h"
+#include <libcper/generator/sections/gen-section.h>
CPER_GENERATOR_DEFINITION generator_definitions[] = {
{ &gEfiProcessorGenericErrorSectionGuid, "generic",
diff --git a/BaseTypes.h b/include/libcper/BaseTypes.h
similarity index 100%
rename from BaseTypes.h
rename to include/libcper/BaseTypes.h
diff --git a/Cper.h b/include/libcper/Cper.h
similarity index 99%
rename from Cper.h
rename to include/libcper/Cper.h
index a982d18..4a647cf 100644
--- a/Cper.h
+++ b/include/libcper/Cper.h
@@ -13,8 +13,8 @@
#ifndef __CPER_GUID_H__
#define __CPER_GUID_H__
-#include "BaseTypes.h"
-#include "common-utils.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/common-utils.h>
#ifdef __cplusplus
extern "C" {
diff --git a/base64.h b/include/libcper/base64.h
similarity index 92%
rename from base64.h
rename to include/libcper/base64.h
index 74d05f7..78bf1c1 100644
--- a/base64.h
+++ b/include/libcper/base64.h
@@ -5,7 +5,7 @@
extern "C" {
#endif
-#include "BaseTypes.h"
+#include <libcper/BaseTypes.h>
/**
* base64_decode
diff --git a/common-utils.h b/include/libcper/common-utils.h
similarity index 91%
rename from common-utils.h
rename to include/libcper/common-utils.h
index 4d5fb4a..2528f59 100644
--- a/common-utils.h
+++ b/include/libcper/common-utils.h
@@ -1,7 +1,7 @@
#ifndef CPER_LIB_COMMON_UTILS_H
#define CPER_LIB_COMMON_UTILS_H
-#include "BaseTypes.h"
+#include <libcper/BaseTypes.h>
int bcd_to_int(UINT8 bcd);
UINT8 int_to_bcd(int value);
diff --git a/cper-parse-str.h b/include/libcper/cper-parse-str.h
similarity index 92%
rename from cper-parse-str.h
rename to include/libcper/cper-parse-str.h
index 268a4b7..95db594 100644
--- a/cper-parse-str.h
+++ b/include/libcper/cper-parse-str.h
@@ -1,6 +1,8 @@
#ifndef CPER_PARSE_STR_H
#define CPER_PARSE_STR_H
+#include <stddef.h>
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/cper-parse.h b/include/libcper/cper-parse.h
similarity index 98%
rename from cper-parse.h
rename to include/libcper/cper-parse.h
index e50d0cc..4b966f1 100644
--- a/cper-parse.h
+++ b/include/libcper/cper-parse.h
@@ -6,6 +6,7 @@
#endif
#include <json.h>
+#include <stdio.h>
#define CPER_HEADER_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/cper-utils.h b/include/libcper/cper-utils.h
similarity index 96%
rename from cper-utils.h
rename to include/libcper/cper-utils.h
index e4c14a1..603a4d7 100644
--- a/cper-utils.h
+++ b/include/libcper/cper-utils.h
@@ -8,7 +8,8 @@
extern "C" {
#endif
-#include "common-utils.h"
+#include <libcper/common-utils.h>
+#include <libcper/Cper.h>
#include <json.h>
json_object *
diff --git a/generator/cper-generate.h b/include/libcper/generator/cper-generate.h
similarity index 89%
rename from generator/cper-generate.h
rename to include/libcper/generator/cper-generate.h
index ad196bd..97f5ea6 100644
--- a/generator/cper-generate.h
+++ b/include/libcper/generator/cper-generate.h
@@ -6,7 +6,7 @@
#endif
#include <stdio.h>
-#include "BaseTypes.h"
+#include <libcper/BaseTypes.h>
void generate_cper_record(char **types, UINT16 num_sections, FILE *out);
void generate_single_section_record(char *type, FILE *out);
diff --git a/generator/gen-utils.h b/include/libcper/generator/gen-utils.h
similarity index 91%
rename from generator/gen-utils.h
rename to include/libcper/generator/gen-utils.h
index 5a19d85..8588cc1 100644
--- a/generator/gen-utils.h
+++ b/include/libcper/generator/gen-utils.h
@@ -6,8 +6,8 @@
#endif
#include <stdlib.h>
-#include "BaseTypes.h"
-#include "../common-utils.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/common-utils.h>
#define CPER_ERROR_TYPES_KEYS \
(int[]) \
diff --git a/generator/sections/gen-section.h b/include/libcper/generator/sections/gen-section.h
similarity index 97%
rename from generator/sections/gen-section.h
rename to include/libcper/generator/sections/gen-section.h
index 6ce5a88..53c25c8 100644
--- a/generator/sections/gen-section.h
+++ b/include/libcper/generator/sections/gen-section.h
@@ -6,7 +6,7 @@
#endif
#include <stdlib.h>
-#include "../../Cper.h"
+#include <libcper/Cper.h>
//Section generator function predefinitions.
size_t generate_section_generic(void **location);
diff --git a/json-schema.h b/include/libcper/json-schema.h
similarity index 100%
rename from json-schema.h
rename to include/libcper/json-schema.h
diff --git a/include/libcper/meson.build b/include/libcper/meson.build
new file mode 100644
index 0000000..44c42ba
--- /dev/null
+++ b/include/libcper/meson.build
@@ -0,0 +1,12 @@
+install_headers(
+ 'BaseTypes.h',
+ 'Cper.h',
+ 'cper-parse.h',
+ 'cper-parse-str.h',
+ 'cper-utils.h',
+ 'common-utils.h',
+ subdir: 'libcper',
+ preserve_path : true
+)
+
+install_headers('generator/cper-generate.h', subdir: 'libcper/generator')
\ No newline at end of file
diff --git a/sections/cper-section-ampere.h b/include/libcper/sections/cper-section-ampere.h
similarity index 88%
rename from sections/cper-section-ampere.h
rename to include/libcper/sections/cper-section-ampere.h
index 978f6db..3d3f744 100644
--- a/sections/cper-section-ampere.h
+++ b/include/libcper/sections/cper-section-ampere.h
@@ -2,7 +2,7 @@
#define CPER_SECTION_AMPERE_H
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
json_object *cper_section_ampere_to_ir(void *section);
void ir_section_ampere_to_cper(json_object *section, FILE *out);
diff --git a/sections/cper-section-arm.h b/include/libcper/sections/cper-section-arm.h
similarity index 99%
rename from sections/cper-section-arm.h
rename to include/libcper/sections/cper-section-arm.h
index 8601992..0580801 100644
--- a/sections/cper-section-arm.h
+++ b/include/libcper/sections/cper-section-arm.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define ARM_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-ccix-per.h b/include/libcper/sections/cper-section-ccix-per.h
similarity index 96%
rename from sections/cper-section-ccix-per.h
rename to include/libcper/sections/cper-section-ccix-per.h
index c8bfbb0..80f7ae4 100644
--- a/sections/cper-section-ccix-per.h
+++ b/include/libcper/sections/cper-section-ccix-per.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define CCIX_PER_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-cxl-component.h b/include/libcper/sections/cper-section-cxl-component.h
similarity index 97%
rename from sections/cper-section-cxl-component.h
rename to include/libcper/sections/cper-section-cxl-component.h
index 56b092c..2e60294 100644
--- a/sections/cper-section-cxl-component.h
+++ b/include/libcper/sections/cper-section-cxl-component.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define CXL_COMPONENT_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-cxl-protocol.h b/include/libcper/sections/cper-section-cxl-protocol.h
similarity index 98%
rename from sections/cper-section-cxl-protocol.h
rename to include/libcper/sections/cper-section-cxl-protocol.h
index 71166a2..28e745b 100644
--- a/sections/cper-section-cxl-protocol.h
+++ b/include/libcper/sections/cper-section-cxl-protocol.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define CXL_PROTOCOL_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-dmar-generic.h b/include/libcper/sections/cper-section-dmar-generic.h
similarity index 98%
rename from sections/cper-section-dmar-generic.h
rename to include/libcper/sections/cper-section-dmar-generic.h
index e305c86..5a6dd4f 100644
--- a/sections/cper-section-dmar-generic.h
+++ b/include/libcper/sections/cper-section-dmar-generic.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define DMAR_GENERIC_ERROR_FAULT_REASON_TYPES_KEYS \
(int[]) \
diff --git a/sections/cper-section-dmar-iommu.h b/include/libcper/sections/cper-section-dmar-iommu.h
similarity index 91%
rename from sections/cper-section-dmar-iommu.h
rename to include/libcper/sections/cper-section-dmar-iommu.h
index 24204b7..6b2aa6f 100644
--- a/sections/cper-section-dmar-iommu.h
+++ b/include/libcper/sections/cper-section-dmar-iommu.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
json_object *cper_section_dmar_iommu_to_ir(void *section);
void ir_section_dmar_iommu_to_cper(json_object *section, FILE *out);
diff --git a/sections/cper-section-dmar-vtd.h b/include/libcper/sections/cper-section-dmar-vtd.h
similarity index 97%
rename from sections/cper-section-dmar-vtd.h
rename to include/libcper/sections/cper-section-dmar-vtd.h
index 1d1e91e..5c3c876 100644
--- a/sections/cper-section-dmar-vtd.h
+++ b/include/libcper/sections/cper-section-dmar-vtd.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define VTD_FAULT_RECORD_TYPES_KEYS \
(int[]) \
diff --git a/sections/cper-section-firmware.h b/include/libcper/sections/cper-section-firmware.h
similarity index 97%
rename from sections/cper-section-firmware.h
rename to include/libcper/sections/cper-section-firmware.h
index c37ee1f..ea1e19a 100644
--- a/sections/cper-section-firmware.h
+++ b/include/libcper/sections/cper-section-firmware.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define FIRMWARE_ERROR_RECORD_TYPES_KEYS \
(int[]) \
diff --git a/sections/cper-section-generic.h b/include/libcper/sections/cper-section-generic.h
similarity index 98%
rename from sections/cper-section-generic.h
rename to include/libcper/sections/cper-section-generic.h
index 26fec69..6ec3ba4 100644
--- a/sections/cper-section-generic.h
+++ b/include/libcper/sections/cper-section-generic.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define GENERIC_PROC_TYPES_KEYS \
(int[]) \
diff --git a/sections/cper-section-ia32x64.h b/include/libcper/sections/cper-section-ia32x64.h
similarity index 99%
rename from sections/cper-section-ia32x64.h
rename to include/libcper/sections/cper-section-ia32x64.h
index b087099..4da2517 100644
--- a/sections/cper-section-ia32x64.h
+++ b/include/libcper/sections/cper-section-ia32x64.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define IA32X64_PROCESSOR_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-ipf.h b/include/libcper/sections/cper-section-ipf.h
similarity index 98%
rename from sections/cper-section-ipf.h
rename to include/libcper/sections/cper-section-ipf.h
index 02cc025..95b3012 100644
--- a/sections/cper-section-ipf.h
+++ b/include/libcper/sections/cper-section-ipf.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define IPF_MOD_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-memory.h b/include/libcper/sections/cper-section-memory.h
similarity index 98%
rename from sections/cper-section-memory.h
rename to include/libcper/sections/cper-section-memory.h
index ed2bc70..71991f2 100644
--- a/sections/cper-section-memory.h
+++ b/include/libcper/sections/cper-section-memory.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define MEMORY_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-nvidia.h b/include/libcper/sections/cper-section-nvidia.h
similarity index 91%
rename from sections/cper-section-nvidia.h
rename to include/libcper/sections/cper-section-nvidia.h
index c3b9deb..b5bb594 100644
--- a/sections/cper-section-nvidia.h
+++ b/include/libcper/sections/cper-section-nvidia.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
json_object *cper_section_nvidia_to_ir(void *section);
void ir_section_nvidia_to_cper(json_object *section, FILE *out);
diff --git a/sections/cper-section-pci-bus.h b/include/libcper/sections/cper-section-pci-bus.h
similarity index 98%
rename from sections/cper-section-pci-bus.h
rename to include/libcper/sections/cper-section-pci-bus.h
index 69e2522..34fd368 100644
--- a/sections/cper-section-pci-bus.h
+++ b/include/libcper/sections/cper-section-pci-bus.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define PCI_BUS_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-pci-dev.h b/include/libcper/sections/cper-section-pci-dev.h
similarity index 97%
rename from sections/cper-section-pci-dev.h
rename to include/libcper/sections/cper-section-pci-dev.h
index 3ceba5a..7396aa7 100644
--- a/sections/cper-section-pci-dev.h
+++ b/include/libcper/sections/cper-section-pci-dev.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define PCI_DEV_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section-pcie.h b/include/libcper/sections/cper-section-pcie.h
similarity index 98%
rename from sections/cper-section-pcie.h
rename to include/libcper/sections/cper-section-pcie.h
index 1a2d729..cc54ebd 100644
--- a/sections/cper-section-pcie.h
+++ b/include/libcper/sections/cper-section-pcie.h
@@ -6,7 +6,7 @@
#endif
#include <json.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
#define PCIE_ERROR_VALID_BITFIELD_NAMES \
(const char *[]) \
diff --git a/sections/cper-section.h b/include/libcper/sections/cper-section.h
similarity index 94%
rename from sections/cper-section.h
rename to include/libcper/sections/cper-section.h
index dec0b1b..f288f2a 100644
--- a/sections/cper-section.h
+++ b/include/libcper/sections/cper-section.h
@@ -8,7 +8,7 @@
#include <json.h>
#include <stdio.h>
#include <stdlib.h>
-#include "Cper.h"
+#include <libcper/Cper.h>
//Definition structure for a single CPER section type.
typedef struct {
diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 0000000..4865b92
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1 @@
+subdir('libcper')
diff --git a/ir-parse.c b/ir-parse.c
index cacccc0..69f2186 100644
--- a/ir-parse.c
+++ b/ir-parse.c
@@ -7,11 +7,11 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "cper-parse.h"
-#include "cper-utils.h"
-#include "sections/cper-section.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-parse.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section.h>
//Private pre-declarations.
void ir_header_to_cper(json_object *header_ir,
diff --git a/json-schema.c b/json-schema.c
index dbbffbc..9eb60be 100644
--- a/json-schema.c
+++ b/json-schema.c
@@ -12,8 +12,8 @@
#include <limits.h>
#include <stdarg.h>
#include <json.h>
-#include "json-schema.h"
-#include "BaseTypes.h"
+#include <libcper/json-schema.h>
+#include <libcper/BaseTypes.h>
//Field definitions.
int json_validator_debug = 0;
diff --git a/meson.build b/meson.build
index acfb2d0..fb4a399 100644
--- a/meson.build
+++ b/meson.build
@@ -85,7 +85,9 @@
'json-schema.c',
)
-libcper_include = ['.']
+libcper_include = ['include']
+libcper_include_dir = include_directories(libcper_include, is_system: true)
+subdir('include')
libcper_parse = library(
'cper-parse',
@@ -93,14 +95,14 @@
section_sources,
edk_sources,
version: meson.project_version(),
- include_directories: include_directories(libcper_include),
+ include_directories: libcper_include_dir,
c_args: '-Wno-address-of-packed-member',
dependencies: [json_c_dep],
install: true,
install_dir: get_option('libdir'),
)
libcper_parse_dep = declare_dependency(
- include_directories: include_directories(libcper_include),
+ include_directories: libcper_include_dir,
link_with: libcper_parse,
)
@@ -115,13 +117,13 @@
libcper_generate_sources,
generator_section_sources,
version: meson.project_version(),
- include_directories: include_directories(libcper_include),
+ include_directories: libcper_include_dir,
dependencies: [libcper_parse_dep, json_c_dep],
install: true,
install_dir: get_option('libdir'),
)
libcper_generate_dep = declare_dependency(
- include_directories: include_directories(libcper_include),
+ include_directories: libcper_include_dir,
link_with: libcper_generate,
)
@@ -132,25 +134,11 @@
description: 'C bindings for parsing CPER',
)
-install_headers(
- 'cper-parse.h',
- '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')
-
if get_option('utility').allowed()
executable(
'cper-convert',
'cli-app/cper-convert.c',
- include_directories: include_directories(libcper_include),
+ include_directories: libcper_include_dir,
dependencies: [libcper_parse_dep, json_c_dep],
install: true,
install_dir: get_option('bindir'),
@@ -160,7 +148,7 @@
'cper-generate',
'generator/cper-generate-cli.c',
edk_sources,
- include_directories: include_directories(libcper_include),
+ include_directories: libcper_include_dir,
dependencies: [libcper_generate_dep],
install: true,
install_dir: get_option('bindir'),
diff --git a/sections/cper-section-ampere.c b/sections/cper-section-ampere.c
index 9fa5a8b..7604dc0 100644
--- a/sections/cper-section-ampere.c
+++ b/sections/cper-section-ampere.c
@@ -1,8 +1,8 @@
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-ampere.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-ampere.h>
//Converts the given processor-generic CPER section into JSON IR.
json_object *cper_section_ampere_to_ir(void *section)
diff --git a/sections/cper-section-arm.c b/sections/cper-section-arm.c
index db0f54c..119b30a 100644
--- a/sections/cper-section-arm.c
+++ b/sections/cper-section-arm.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-arm.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-arm.h>
//Private pre-definitions.
json_object *
diff --git a/sections/cper-section-ccix-per.c b/sections/cper-section-ccix-per.c
index 6e3fa96..9081fe2 100644
--- a/sections/cper-section-ccix-per.c
+++ b/sections/cper-section-ccix-per.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-ccix-per.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-ccix-per.h>
//Converts a single CCIX PER log CPER section into JSON IR.
json_object *cper_section_ccix_per_to_ir(void *section)
diff --git a/sections/cper-section-cxl-component.c b/sections/cper-section-cxl-component.c
index d085189..a5c6846 100644
--- a/sections/cper-section-cxl-component.c
+++ b/sections/cper-section-cxl-component.c
@@ -6,10 +6,10 @@
**/
#include <stdio.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-cxl-component.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-cxl-component.h>
//Converts a single CXL component error CPER section into JSON IR.
json_object *cper_section_cxl_component_to_ir(void *section)
diff --git a/sections/cper-section-cxl-protocol.c b/sections/cper-section-cxl-protocol.c
index fa01a8a..141f26b 100644
--- a/sections/cper-section-cxl-protocol.c
+++ b/sections/cper-section-cxl-protocol.c
@@ -6,10 +6,10 @@
**/
#include <stdio.h>
#include <string.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-cxl-protocol.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-cxl-protocol.h>
//Converts a single CXL protocol error CPER section into JSON IR.
json_object *cper_section_cxl_protocol_to_ir(void *section)
diff --git a/sections/cper-section-dmar-generic.c b/sections/cper-section-dmar-generic.c
index 6a28d88..9e5f06a 100644
--- a/sections/cper-section-dmar-generic.c
+++ b/sections/cper-section-dmar-generic.c
@@ -6,9 +6,9 @@
**/
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-dmar-generic.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-dmar-generic.h>
//Converts a single generic DMAr CPER section into JSON IR.
json_object *cper_section_dmar_generic_to_ir(void *section)
diff --git a/sections/cper-section-dmar-iommu.c b/sections/cper-section-dmar-iommu.c
index 3606021..1f08376 100644
--- a/sections/cper-section-dmar-iommu.c
+++ b/sections/cper-section-dmar-iommu.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-dmar-iommu.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-dmar-iommu.h>
//Converts a single IOMMU specific DMAr CPER section into JSON IR.
json_object *cper_section_dmar_iommu_to_ir(void *section)
diff --git a/sections/cper-section-dmar-vtd.c b/sections/cper-section-dmar-vtd.c
index 88a4835..5c0016b 100644
--- a/sections/cper-section-dmar-vtd.c
+++ b/sections/cper-section-dmar-vtd.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-dmar-vtd.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-dmar-vtd.h>
//Converts a single VT-d specific DMAr CPER section into JSON IR.
json_object *cper_section_dmar_vtd_to_ir(void *section)
diff --git a/sections/cper-section-firmware.c b/sections/cper-section-firmware.c
index 3f17fe7..7316295 100644
--- a/sections/cper-section-firmware.c
+++ b/sections/cper-section-firmware.c
@@ -6,9 +6,9 @@
**/
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-firmware.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-firmware.h>
//Converts a single firmware CPER section into JSON IR.
json_object *cper_section_firmware_to_ir(void *section)
diff --git a/sections/cper-section-generic.c b/sections/cper-section-generic.c
index b803bc1..ebbd628 100644
--- a/sections/cper-section-generic.c
+++ b/sections/cper-section-generic.c
@@ -8,9 +8,9 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-generic.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-generic.h>
//Converts the given processor-generic CPER section into JSON IR.
json_object *cper_section_generic_to_ir(void *section)
diff --git a/sections/cper-section-ia32x64.c b/sections/cper-section-ia32x64.c
index 2762867..bdeb4fa 100644
--- a/sections/cper-section-ia32x64.c
+++ b/sections/cper-section-ia32x64.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-ia32x64.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-ia32x64.h>
//Private pre-definitions.
json_object *cper_ia32x64_processor_error_info_to_ir(
diff --git a/sections/cper-section-ipf.c b/sections/cper-section-ipf.c
index 3c47504..a8a4e8f 100644
--- a/sections/cper-section-ipf.c
+++ b/sections/cper-section-ipf.c
@@ -6,9 +6,9 @@
**/
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-ipf.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-ipf.h>
json_object *cper_ipf_mod_error_read_array(EFI_IPF_MOD_ERROR_INFO **cur_error,
int num_to_read);
diff --git a/sections/cper-section-memory.c b/sections/cper-section-memory.c
index 073041d..68e63af 100644
--- a/sections/cper-section-memory.c
+++ b/sections/cper-section-memory.c
@@ -6,9 +6,9 @@
**/
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-memory.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-memory.h>
//Converts a single memory error CPER section into JSON IR.
json_object *cper_section_platform_memory_to_ir(void *section)
diff --git a/sections/cper-section-nvidia.c b/sections/cper-section-nvidia.c
index 259eef1..d5587c5 100644
--- a/sections/cper-section-nvidia.c
+++ b/sections/cper-section-nvidia.c
@@ -7,9 +7,9 @@
#include <stddef.h>
#include <string.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-nvidia.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-nvidia.h>
//Converts a single NVIDIA CPER section into JSON IR.
json_object *cper_section_nvidia_to_ir(void *section)
diff --git a/sections/cper-section-pci-bus.c b/sections/cper-section-pci-bus.c
index a4fc3c8..154c1cf 100644
--- a/sections/cper-section-pci-bus.c
+++ b/sections/cper-section-pci-bus.c
@@ -7,9 +7,9 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-pci-bus.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-pci-bus.h>
//Converts a single PCI/PCI-X bus CPER section into JSON IR.
json_object *cper_section_pci_bus_to_ir(void *section)
diff --git a/sections/cper-section-pci-dev.c b/sections/cper-section-pci-dev.c
index 5245e3f..ccf9f0c 100644
--- a/sections/cper-section-pci-dev.c
+++ b/sections/cper-section-pci-dev.c
@@ -6,9 +6,9 @@
**/
#include <stdio.h>
#include <json.h>
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-pci-dev.h"
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-pci-dev.h>
//Converts a single PCI/PCI-X device CPER section into JSON IR.
json_object *cper_section_pci_dev_to_ir(void *section)
diff --git a/sections/cper-section-pcie.c b/sections/cper-section-pcie.c
index fa6b0b2..ecf6d52 100644
--- a/sections/cper-section-pcie.c
+++ b/sections/cper-section-pcie.c
@@ -7,10 +7,10 @@
#include <stdio.h>
#include <string.h>
#include <json.h>
-#include "base64.h"
-#include "Cper.h"
-#include "../cper-utils.h"
-#include "cper-section-pcie.h"
+#include <libcper/base64.h>
+#include <libcper/Cper.h>
+#include <libcper/cper-utils.h>
+#include <libcper/sections/cper-section-pcie.h>
//Converts a single PCIe CPER section into JSON IR.
json_object *cper_section_pcie_to_ir(void *section)
diff --git a/sections/cper-section.c b/sections/cper-section.c
index 11832c8..f027c2d 100644
--- a/sections/cper-section.c
+++ b/sections/cper-section.c
@@ -3,25 +3,25 @@
*
* Author: Lawrence.Tang@arm.com
**/
-#include "Cper.h"
-#include "cper-section.h"
-#include "cper-section-arm.h"
-#include "cper-section-generic.h"
-#include "cper-section-ia32x64.h"
-#include "cper-section-ipf.h"
-#include "cper-section-memory.h"
-#include "cper-section-pcie.h"
-#include "cper-section-firmware.h"
-#include "cper-section-pci-bus.h"
-#include "cper-section-pci-dev.h"
-#include "cper-section-dmar-generic.h"
-#include "cper-section-dmar-vtd.h"
-#include "cper-section-dmar-iommu.h"
-#include "cper-section-ccix-per.h"
-#include "cper-section-cxl-protocol.h"
-#include "cper-section-cxl-component.h"
-#include "cper-section-nvidia.h"
-#include "cper-section-ampere.h"
+#include <libcper/Cper.h>
+#include <libcper/sections/cper-section.h>
+#include <libcper/sections/cper-section-arm.h>
+#include <libcper/sections/cper-section-generic.h>
+#include <libcper/sections/cper-section-ia32x64.h>
+#include <libcper/sections/cper-section-ipf.h>
+#include <libcper/sections/cper-section-memory.h>
+#include <libcper/sections/cper-section-pcie.h>
+#include <libcper/sections/cper-section-firmware.h>
+#include <libcper/sections/cper-section-pci-bus.h>
+#include <libcper/sections/cper-section-pci-dev.h>
+#include <libcper/sections/cper-section-dmar-generic.h>
+#include <libcper/sections/cper-section-dmar-vtd.h>
+#include <libcper/sections/cper-section-dmar-iommu.h>
+#include <libcper/sections/cper-section-ccix-per.h>
+#include <libcper/sections/cper-section-cxl-protocol.h>
+#include <libcper/sections/cper-section-cxl-component.h>
+#include <libcper/sections/cper-section-nvidia.h>
+#include <libcper/sections/cper-section-ampere.h>
//Definitions of all sections available to the CPER parser.
CPER_SECTION_DEFINITION section_definitions[] = {
diff --git a/tests/base64_test.cpp b/tests/base64_test.cpp
index 3fcb3af..6040c00 100644
--- a/tests/base64_test.cpp
+++ b/tests/base64_test.cpp
@@ -1,4 +1,4 @@
-#include "base64.h"
+#include <libcper/base64.h>
#include "gtest/gtest.h"
#include "gmock/gmock.h"
diff --git a/tests/ir-tests.cpp b/tests/ir-tests.cpp
index 0146cac..5041a23 100644
--- a/tests/ir-tests.cpp
+++ b/tests/ir-tests.cpp
@@ -8,11 +8,11 @@
#include "gtest/gtest.h"
#include "test-utils.hpp"
#include <json.h>
-#include "../cper-parse.h"
-#include "../json-schema.h"
-#include "../generator/cper-generate.h"
-#include "../sections/cper-section.h"
-#include "../generator/sections/gen-section.h"
+#include <libcper/cper-parse.h>
+#include <libcper/json-schema.h>
+#include <libcper/generator/cper-generate.h>
+#include <libcper/sections/cper-section.h>
+#include <libcper/generator/sections/gen-section.h>
/*
* Test templates.
diff --git a/tests/meson.build b/tests/meson.build
index abfc497..68eb1f3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -21,7 +21,7 @@
sources = ['ir-tests.cpp', 'test-utils.cpp', 'base64_test.cpp']
-test_include_dirs = ['.', '..']
+test_include_dirs = ['.', '../include']
cper_tests = executable(
'cper-tests',
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp
index c508e8d..e16413c 100644
--- a/tests/test-utils.cpp
+++ b/tests/test-utils.cpp
@@ -8,8 +8,8 @@
#include <cstdlib>
#include "test-utils.hpp"
-#include "BaseTypes.h"
-#include "../generator/cper-generate.h"
+#include <libcper/BaseTypes.h>
+#include <libcper/generator/cper-generate.h>
//Returns a ready-for-use memory stream containing a CPER record with the given sections inside.
FILE *generate_record_memstream(const char **types, UINT16 num_types,
diff --git a/tests/test-utils.hpp b/tests/test-utils.hpp
index af9390e..38e24a7 100644
--- a/tests/test-utils.hpp
+++ b/tests/test-utils.hpp
@@ -2,7 +2,7 @@
#define CPER_IR_TEST_UTILS_H
extern "C" {
-#include "BaseTypes.h"
+#include <libcper/BaseTypes.h>
}
FILE *generate_record_memstream(const char **types, UINT16 num_types,