Use static paths in makefile for programs
This commit uses static paths in the makefile to create programs since
the script generate_visualc_files.pl cannot substitute variable paths.
Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
diff --git a/programs/Makefile b/programs/Makefile
index d2cee1c..3319d71 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -1,4 +1,3 @@
-TF-PSA-CRYPTO_CORE_PATH = ../tf-psa-crypto/programs
MBEDTLS_TEST_PATH = ../tests
include ../scripts/common.make
@@ -30,6 +29,9 @@
## be declared by appending with `APPS += ...` afterwards.
## See the get_app_list function in scripts/generate_visualc_files.pl and
## make sure to check that it still works if you tweak the format here.
+##
+## Note: Variables cannot be used to define an apps path. This cannot be
+## substituted by the script generate_visualc_files.pl.
APPS = \
aes/crypt_and_hash \
cipher/cipher_aead_demo \
@@ -56,12 +58,12 @@
pkey/rsa_sign_pss \
pkey/rsa_verify \
pkey/rsa_verify_pss \
- $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/aead_demo \
- $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/crypto_examples \
- $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/hmac_demo \
- $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/key_ladder_demo \
- $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_constant_names \
- $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_hash \
+ ../tf-psa-crypto/programs/psa/aead_demo \
+ ../tf-psa-crypto/programs/psa/crypto_examples \
+ ../tf-psa-crypto/programs/psa/hmac_demo \
+ ../tf-psa-crypto/programs/psa/key_ladder_demo \
+ ../tf-psa-crypto/programs/psa/psa_constant_names \
+ ../tf-psa-crypto/programs/psa/psa_hash \
random/gen_entropy \
random/gen_random_ctr_drbg \
ssl/dtls_client \
@@ -253,29 +255,29 @@
echo " CC pkey/rsa_encrypt.c"
$(CC) $(LOCAL_CFLAGS) $(CFLAGS) pkey/rsa_encrypt.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-$(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/aead_demo$(EXEXT): $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/aead_demo.c $(DEP)
- echo " CC $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/aead_demo.c"
- $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/aead_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+../tf-psa-crypto/programs/psa/aead_demo$(EXEXT): ../tf-psa-crypto/programs/psa/aead_demo.c $(DEP)
+ echo " CC ../tf-psa-crypto/programs/psa/aead_demo.c"
+ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) ../tf-psa-crypto/programs/psa/aead_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-$(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/crypto_examples$(EXEXT): $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/crypto_examples.c $(DEP)
- echo " CC $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/crypto_examples.c"
- $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/crypto_examples.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+../tf-psa-crypto/programs/psa/crypto_examples$(EXEXT): ../tf-psa-crypto/programs/psa/crypto_examples.c $(DEP)
+ echo " CC ../tf-psa-crypto/programs/psa/crypto_examples.c"
+ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) ../tf-psa-crypto/programs/psa/crypto_examples.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-$(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/hmac_demo$(EXEXT): $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/hmac_demo.c $(DEP)
- echo " CC $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/hmac_demo.c"
- $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/hmac_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+../tf-psa-crypto/programs/psa/hmac_demo$(EXEXT): ../tf-psa-crypto/programs/psa/hmac_demo.c $(DEP)
+ echo " CC ../tf-psa-crypto/programs/psa/hmac_demo.c"
+ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) ../tf-psa-crypto/programs/psa/hmac_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-$(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/key_ladder_demo$(EXEXT): $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/key_ladder_demo.c $(DEP)
- echo " CC $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/key_ladder_demo.c"
- $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/key_ladder_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+../tf-psa-crypto/programs/psa/key_ladder_demo$(EXEXT): ../tf-psa-crypto/programs/psa/key_ladder_demo.c $(DEP)
+ echo " CC ../tf-psa-crypto/programs/psa/key_ladder_demo.c"
+ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) ../tf-psa-crypto/programs/psa/key_ladder_demo.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-$(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_constant_names$(EXEXT): $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_constant_names.c psa/psa_constant_names_generated.c $(DEP)
- echo " CC $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_constant_names.c"
- $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_constant_names.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+../tf-psa-crypto/programs/psa/psa_constant_names$(EXEXT): ../tf-psa-crypto/programs/psa/psa_constant_names.c psa/psa_constant_names_generated.c $(DEP)
+ echo " CC ../tf-psa-crypto/programs/psa/psa_constant_names.c"
+ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) ../tf-psa-crypto/programs/psa/psa_constant_names.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
-$(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_hash$(EXEXT): $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_hash.c $(DEP)
- echo " CC $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_hash.c"
- $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $(TF-PSA-CRYPTO_PROGRAM_PATH)/psa/psa_hash.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
+../tf-psa-crypto/programs/psa/psa_hash$(EXEXT): ../tf-psa-crypto/programs/psa/psa_hash.c $(DEP)
+ echo " CC ../tf-psa-crypto/programs/psa/psa_hash.c"
+ $(CC) $(LOCAL_CFLAGS) $(CFLAGS) ../tf-psa-crypto/programs/psa/psa_hash.c $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@
random/gen_entropy$(EXEXT): random/gen_entropy.c $(DEP)
echo " CC random/gen_entropy.c"
diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl
index f6ab627..d0fcb7d 100755
--- a/scripts/generate_visualc_files.pl
+++ b/scripts/generate_visualc_files.pl
@@ -186,7 +186,6 @@
sub get_app_list {
my $makefile_contents = slurp_file('programs/Makefile');
- $makefile_contents =~ s/\$\(TF-PSA-CRYPTO_PROGRAM_PATH\)/..\/tf-psa-crypto\/programs/g;
$makefile_contents =~ /\n\s*APPS\s*=[\\\s]*(.*?)(?<!\\)[\#\n]/s
or die "Cannot find APPS = ... in programs/Makefile\n";
return split /(?:\s|\\)+/, $1;