mirror of
https://github.com/Mbed-TLS/mbedtls-framework.git
synced 2026-09-15 14:49:55 +00:00
Add missing dependencies on generated headers
Without those dependencies, the headers don't get generated. Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
+19
-11
@@ -20,9 +20,22 @@ SERVER_LIBS := -Lserver_libs -lmbedcrypto
|
|||||||
COMMON_INCLUDE := -I./include -I$(MBEDTLS_PATH)/include \
|
COMMON_INCLUDE := -I./include -I$(MBEDTLS_PATH)/include \
|
||||||
$(TF_PSA_CRYPTO_LIBRARY_PUBLIC_INCLUDE)
|
$(TF_PSA_CRYPTO_LIBRARY_PUBLIC_INCLUDE)
|
||||||
|
|
||||||
GENERATED_H_FILES = include/psa_manifest/manifest.h \
|
GENERATED_MANIFEST_H_FILES = \
|
||||||
include/psa_manifest/pid.h \
|
include/psa_manifest/manifest.h \
|
||||||
include/psa_manifest/sid.h
|
include/psa_manifest/pid.h \
|
||||||
|
include/psa_manifest/sid.h
|
||||||
|
|
||||||
|
GENERATED_WRAPPER_H_FILES = \
|
||||||
|
src/psa_sim_serialise.h \
|
||||||
|
src/psa_functions_codes.h
|
||||||
|
|
||||||
|
GENERATED_H_FILES = $(GENERATED_MANIFEST_H_FILES) $(GENERATED_WRAPPER_H_FILES)
|
||||||
|
|
||||||
|
GENERATED_C_FILES = \
|
||||||
|
src/psa_sim_serialise.c \
|
||||||
|
src/psa_sim_crypto_client.c src/psa_sim_crypto_server.c
|
||||||
|
|
||||||
|
PSASIM_GENERATED_FILES = $(GENERATED_H_FILES) $(PARTITION_SERVER_BOOTSTRAP) $(GENERATED_C_FILES)
|
||||||
|
|
||||||
LIBPSACLIENT_SRC = src/psa_ff_client.c \
|
LIBPSACLIENT_SRC = src/psa_ff_client.c \
|
||||||
src/psa_sim_crypto_client.c \
|
src/psa_sim_crypto_client.c \
|
||||||
@@ -45,6 +58,8 @@ PSA_SERVER_SRC = $(PARTITION_SERVER_BOOTSTRAP) \
|
|||||||
|
|
||||||
all:
|
all:
|
||||||
|
|
||||||
|
generated_files: $(PSASIM_GENERATED_FILES)
|
||||||
|
|
||||||
test/seedfile:
|
test/seedfile:
|
||||||
dd if=/dev/urandom of=./test/seedfile bs=64 count=1
|
dd if=/dev/urandom of=./test/seedfile bs=64 count=1
|
||||||
|
|
||||||
@@ -64,13 +79,9 @@ test/psa_client_full: $(PSA_CLIENT_FULL_SRC) $(GENERATED_H_FILES) test/seedfile
|
|||||||
test/psa_server: $(PSA_SERVER_SRC) $(GENERATED_H_FILES)
|
test/psa_server: $(PSA_SERVER_SRC) $(GENERATED_H_FILES)
|
||||||
$(CC) $(COMMON_INCLUDE) $(CFLAGS) $(PSA_SERVER_SRC) $(SERVER_LIBS) $(LDFLAGS) -o $@
|
$(CC) $(COMMON_INCLUDE) $(CFLAGS) $(PSA_SERVER_SRC) $(SERVER_LIBS) $(LDFLAGS) -o $@
|
||||||
|
|
||||||
$(PARTITION_SERVER_BOOTSTRAP) $(GENERATED_H_FILES): src/manifest.json src/server.c
|
$(PARTITION_SERVER_BOOTSTRAP) $(GENERATED_MANIFEST_H_FILES): src/manifest.json src/server.c
|
||||||
tools/psa_autogen.py src/manifest.json
|
tools/psa_autogen.py src/manifest.json
|
||||||
|
|
||||||
GENERATED_C_FILES = \
|
|
||||||
src/psa_sim_serialise.h src/psa_sim_serialise.c \
|
|
||||||
src/psa_functions_codes.h src/psa_sim_crypto_client.c src/psa_sim_crypto_server.c
|
|
||||||
|
|
||||||
src/psa_sim_serialise.h: src/psa_sim_serialise.pl
|
src/psa_sim_serialise.h: src/psa_sim_serialise.pl
|
||||||
cd src && ./psa_sim_serialise.pl h >$(@F)
|
cd src && ./psa_sim_serialise.pl h >$(@F)
|
||||||
|
|
||||||
@@ -82,9 +93,6 @@ src/psa_functions_codes.h src/psa_sim_crypto_client.c src/psa_sim_crypto_server.
|
|||||||
src/psa_functions_codes.h src/psa_sim_crypto_client.c src/psa_sim_crypto_server.c: src/psa_sim_generate.pl
|
src/psa_functions_codes.h src/psa_sim_crypto_client.c src/psa_sim_crypto_server.c: src/psa_sim_generate.pl
|
||||||
cd $(TF_PSA_CRYPTO_PATH) && $(abspath src/psa_sim_generate.pl)
|
cd $(TF_PSA_CRYPTO_PATH) && $(abspath src/psa_sim_generate.pl)
|
||||||
|
|
||||||
PSASIM_GENERATED_FILES = $(GENERATED_H_FILES) $(PARTITION_SERVER_BOOTSTRAP) $(GENERATED_C_FILES)
|
|
||||||
generated_files: $(PSASIM_GENERATED_FILES)
|
|
||||||
|
|
||||||
# Build MbedTLS libraries (crypto, x509 and tls) and copy them locally to
|
# Build MbedTLS libraries (crypto, x509 and tls) and copy them locally to
|
||||||
# build client/server applications.
|
# build client/server applications.
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user