Require framework directory to exist when building

gilles-peskine-arm · gilles-peskine-arm · commit 469f7811fac9 · 2024-02-29T18:19:56.000+01:00
The framework directory will be provided by a submodule.

Signed-off-by: Gilles Peskine &lt;Gilles.Peskine@arm.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -277,6 +277,8 @@ if(LIB_INSTALL_DIR)
     set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
 endif()
 
+add_subdirectory(framework)
+
 add_subdirectory(include)
 
 add_subdirectory(3rdparty)
diff --git a/Makefile b/Makefile
@@ -2,6 +2,8 @@ DESTDIR=/usr/local
 PREFIX=mbedtls_
 PERL ?= perl
 
+include framework/exported.make
+
 .SILENT:
 
 .PHONY: all no_test programs lib tests install uninstall clean test check lcov apidoc apidoc_clean
diff --git a/library/Makefile b/library/Makefile
@@ -1,3 +1,4 @@
+include ../framework/exported.make
 
 # Also see "include/mbedtls/mbedtls_config.h"
 
diff --git a/scripts/common.make b/scripts/common.make
@@ -4,6 +4,8 @@ ifndef MBEDTLS_PATH
 MBEDTLS_PATH := ..
 endif
 
+include $(MBEDTLS_PATH)/framework/exported.make
+
 CFLAGS	?= -O2
 WARNING_CFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral
 WARNING_CXXFLAGS ?= -Wall -Wextra -Wformat=2 -Wno-format-nonliteral

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+include ../framework/exported.make`
`1`	`2`
`2`	`3`	`# Also see "include/mbedtls/mbedtls_config.h"`
`3`	`4`