From 79bf006419f9edf34c4e387d391760483aa90ec4 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 18 Apr 2021 18:52:48 +0200
Subject: [PATCH] Makefile: remove ROOT_DIR

---
 client/Makefile              | 6 ++----
 tools/fpga_compress/Makefile | 2 --
 tools/hitag2crack/Makefile   | 3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index ab26f970e..f120efaf3 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -4,9 +4,6 @@
 # the license.
 #-----------------------------------------------------------------------------
 
-# Must be called before any Makefile include
-ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
 include ../Makefile.defs
 
 INSTALLBIN = proxmark3
@@ -91,6 +88,7 @@ WHEREAMILIBLD =
 MBEDTLSLIBPATH = ../common/mbedtls
 MBEDTLSLIBINC = -I$(MBEDTLSLIBPATH)
 MBEDTLSLIB = $(OBJDIR)/libmbedtls.a
+MBEDTLSLIBCLIENTRELPATH = ../../client
 
 ########################################################
 # optional system libraries to replace local libraries #
@@ -737,7 +735,7 @@ endif
 
 $(MBEDTLSLIB): .FORCE
 	$(info [*] MAKE $@)
-	$(Q)$(MAKE) --no-print-directory -C $(MBEDTLSLIBPATH) OBJDIR=$(ROOT_DIR)$(OBJDIR) BINDIR=$(ROOT_DIR)$(OBJDIR) all
+	$(Q)$(MAKE) --no-print-directory -C $(MBEDTLSLIBPATH) OBJDIR=$(MBEDTLSLIBCLIENTRELPATH)/$(OBJDIR) BINDIR=$(MBEDTLSLIBCLIENTRELPATH)/$(OBJDIR) all
 
 $(REVENGLIB): .FORCE
 	$(info [*] MAKE $@)
diff --git a/tools/fpga_compress/Makefile b/tools/fpga_compress/Makefile
index 4a97776b2..fb2f9d23d 100644
--- a/tools/fpga_compress/Makefile
+++ b/tools/fpga_compress/Makefile
@@ -12,8 +12,6 @@ MYCFLAGS += -DLZ4_MEMORY_USAGE=20  -Wno-redundant-decls -Wno-old-style-definitio
 
 BINS = fpga_compress
 
-ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
 include ../../Makefile.host
 
 fpga_compress: $(OBJDIR)/fpga_compress.o $(MYOBJS)
diff --git a/tools/hitag2crack/Makefile b/tools/hitag2crack/Makefile
index c3e5cebc1..26f538110 100644
--- a/tools/hitag2crack/Makefile
+++ b/tools/hitag2crack/Makefile
@@ -1,6 +1,3 @@
-# Must be called before any Makefile include
-ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-
 include ../../Makefile.defs
 
 all clean install uninstall check: %: crack2/% crack3/% crack4/% crack5/%