external: move endian/endian.h inside a top-level ccan/ directory

To keep better track of the source of dependencies, endian.h should be in a directory path that names the original source, as it is helpful for namespacing headers. This also matches that pattern that was used in secvarctl, so now secvarctl can remove carrying endian.h itself and just use the version provided by libstb-secvar. Signed-off-by: Eric Richter <[email protected]>
IBM · Feb 2, 2024 · 3840656 · 3840656
1 parent 69194d1
commit 3840656
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ target_include_directories ( stb-secvar-openssl AFTER PRIVATE
   ./
   include/
   include/secvar/
-  external/endian/
+  external/
   external/edk2/
 )
 

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ OBJ_DIR = ./obj
 LIB_DIR = ./lib
 TEST_DIR = ./test
 
-INCLUDE = -I./include -I./
+INCLUDE = -I./include -I./ -I./external
 
 DEBUG ?= 0
 ifeq ($(strip $(DEBUG)), 1)

diff --git a/external/endian/LICENSE → external/ccan/endian/LICENSE b/external/endian/LICENSE → external/ccan/endian/LICENSE
diff --git a/external/endian/endian.h → external/ccan/endian/endian.h b/external/endian/endian.h → external/ccan/endian/endian.h
diff --git a/external/edk2/common.h b/external/edk2/common.h
@@ -47,7 +47,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "config.h"
-#include "external/endian/endian.h"
+#include "ccan/endian/endian.h"
 
 #define MAX_HASH_SIZE 32
 #define UUID_SIZE 16

diff --git a/include/config.h b/include/config.h
@@ -30,7 +30,7 @@
 #error __BYTE_ORDER__ is undefined, edit config.h
 #endif
 
-#include <external/endian/endian.h>
+#include <ccan/endian/endian.h>
 #include <stdlib.h>
 #include <openssl/crypto.h>
 

diff --git a/test/Makefile b/test/Makefile
@@ -10,7 +10,7 @@ SRC_DIR = ../src
 BIN_DIR =./bin
 LIB_DIR =../lib
 
-INCLUDE = -I../include -I../
+INCLUDE = -I../include -I../ -I../external
 
 TEST_SRCS = test_esl.c \
             test_auth2.c \