and ... another round

Makefile

@@ -41,15 +41,12 @@ all: main
 tinycbor/Makefile crypto/tiny-AES-c/aes.c:
 	git submodule update --init
 
-.PHONY: cbor cborclean saltyclean
+.PHONY: cbor cborclean
 cbor: $(LIBCBOR)
 
 cborclean:
 	cd tinycbor && $(MAKE) clean
 
-saltyclean:
-	cd crypto/salty/c-api && cargo clean || true # don't fail if cargo not available
-
 $(LIBCBOR):
 	cd tinycbor/ && $(MAKE)  LDFLAGS='' -j8
 
@@ -64,7 +61,6 @@ test: venv
 	$(MAKE) clean
 	$(MAKE) -C . main
 	$(MAKE) clean
-	$(MAKE) saltyclean
 	$(MAKE) -C ./targets/stm32l432 test PREFIX=$(PREFIX) "VENV=$(VENV)" VERSION_FULL=${SOLO_VERSION_FULL}
 	$(MAKE) clean
 	$(MAKE) cppcheck
@@ -131,7 +127,7 @@ clean:
 	done
 	cd fido2 && $(MAKE) clean
 
-full-clean: cborclean saltyclean clean
+full-clean: clean
 	rm -rf venv
 
 test-docker:

targets/stm32l432/Makefile

@@ -108,7 +108,7 @@ cbor:
 	$(MAKE) -f $(APPMAKE) -j8 cbor
 
 salty:
-	$(MAKE) -C ../../crypto/salty/c-api
+	$(MAKE) -f $(APPMAKE) -j8 salty
 
 test:
 	$(MAKE) build-release-locked

targets/stm32l432/build/application.mk

@@ -87,3 +87,6 @@ cbor:
 LDFLAGS="$(LDFLAGS_LIB)" \
 CFLAGS="$(CFLAGS) -Os  -DCBOR_PARSER_MAX_RECURSIONS=3"
 
+salty:
+	cd ../../crypto/salty/c-api && cargo clean
+	cd ../../crypto/salty/c-api && $(MAKE)