From ffa6f694fd22659f4e47a96888e30eec47afa16b Mon Sep 17 00:00:00 2001
From: Xavier Chapron <xavier.chapron@ledger.fr>
Date: Tue, 14 Feb 2023 15:57:29 +0100
Subject: [PATCH 1/2] Makefile: Fix building with new SDK using separate build
 dir

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d81927f1..f1a63413 100644
--- a/Makefile
+++ b/Makefile
@@ -171,13 +171,15 @@ delete:
 # import generic rules from the sdk
 include $(BOLOS_SDK)/Makefile.rules
 
-#add dependency on custom makefile filename
-dep/%.d: %.c Makefile
-
 listvariants:
 	@echo VARIANTS APP tezos_wallet tezos_baking
 
+# Define DEP_DIR to keep compatibility with old SDK
+ifeq ($(DEP_DIR),)
+	DEP_DIR := dep
+endif
+
 # Generate delegates from baker list
 src/delegates.h: tools/gen-delegates.sh tools/BakersRegistryCoreUnfilteredData.json
 	bash ./tools/gen-delegates.sh ./tools/BakersRegistryCoreUnfilteredData.json
-dep/to_string.d: src/delegates.h
+$(DEP_DIR)/to_string.d: src/delegates.h

From 02784d7a6ca0ae46398d7b4477977594075ae224 Mon Sep 17 00:00:00 2001
From: Xavier Chapron <xavier.chapron@ledger.fr>
Date: Tue, 14 Feb 2023 15:58:37 +0100
Subject: [PATCH 2/2] gitignore: Update to new SDK build dir

---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6ad546b..704e84a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
 bin
 debug
-/dep
-obj
-src/u2f_crypto_data.h
-src/glyphs.h
-src/glyphs.c
+build
 src/delegates.h
 
 #ide