diff options
| author | Andrzej Kurek <andrzej.kurek@mobica.com> | 2019-04-17 04:19:37 -0400 |
|---|---|---|
| committer | Andrzej Kurek <andrzej.kurek@mobica.com> | 2019-05-23 03:01:35 -0400 |
| commit | 346747cd24dc0def1d9a6a3d6e5c8832c9a2ddb1 (patch) | |
| tree | 632177cc6401116313a449ff4aef63387223ae80 /Makefile | |
| parent | 67df9e498fcab25df704ea6855bd90f8d4d1dd96 (diff) | |
| download | mbedtls-346747cd24dc0def1d9a6a3d6e5c8832c9a2ddb1.zip mbedtls-346747cd24dc0def1d9a6a3d6e5c8832c9a2ddb1.tar.gz mbedtls-346747cd24dc0def1d9a6a3d6e5c8832c9a2ddb1.tar.bz2 | |
Force the usage of crypto submodule
Remove all.sh tests exercising the optional usage of submodule
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 2 insertions, 15 deletions
@@ -1,7 +1,4 @@ -# build crypto from submodule unless explicitly disabled -USE_CRYPTO_SUBMODULE ?= 1 - DESTDIR=/usr/local PREFIX=mbedtls_ @@ -22,9 +19,7 @@ lib: tests: lib $(MAKE) -C tests -ifneq ($(USE_CRYPTO_SUBMODULE), 0) $(MAKE) CRYPTO_INCLUDES:="-I../../include -I../include" -C crypto/tests -endif ifndef WINDOWS install: no_test @@ -34,13 +29,10 @@ install: no_test mkdir -p $(DESTDIR)/lib cp -RP library/libmbedtls.* $(DESTDIR)/lib cp -RP library/libmbedx509.* $(DESTDIR)/lib -ifneq ($(USE_CRYPTO_SUBMODULE), 0) + mkdir -p $(DESTDIR)/include/psa cp -rp crypto/include/psa $(DESTDIR)/include cp -RP crypto/library/libmbedcrypto.* $(DESTDIR)/lib -else - cp -RP library/libmbedcrypto.* $(DESTDIR)/lib -endif mkdir -p $(DESTDIR)/bin for p in programs/*/* ; do \ @@ -56,9 +48,8 @@ uninstall: rm -f $(DESTDIR)/lib/libmbedtls.* rm -f $(DESTDIR)/lib/libmbedx509.* rm -f $(DESTDIR)/lib/libmbedcrypto.* -ifneq ($(USE_CRYPTO_SUBMODULE), 0) $(MAKE) -C crypto uninstall -endif + for p in programs/*/* ; do \ if [ -x $$p ] && [ ! -d $$p ] ; \ @@ -100,18 +91,14 @@ clean: $(MAKE) -C library clean $(MAKE) -C programs clean $(MAKE) -C tests clean -ifneq ($(USE_CRYPTO_SUBMODULE), 0) $(MAKE) -C crypto clean -endif ifndef WINDOWS find . \( -name \*.gcno -o -name \*.gcda -o -name \*.info \) -exec rm {} + endif check: lib tests $(MAKE) -C tests check -ifneq ($(USE_CRYPTO_SUBMODULE), 0) $(MAKE) CRYPTO_INCLUDES:="-I../../include -I../include" -C crypto/tests check -endif test: check |