make/cmake: remove weirdy include paths like src/uart/../crypto

client/src/cmddata.c

@@ -21,7 +21,7 @@
 #include "graph.h"               // for graph data
 #include "comms.h"
 #include "lfdemod.h"             // for demod code
-#include "../loclass/cipherutils.h" // for decimating samples in getsamples
+#include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h"           // askem410xdecode
 #include "fileutils.h"           // searchFile
 #include "mifare/ndef.h"

client/src/cmdhf15.c

@@ -29,7 +29,7 @@
 #include "comms.h"        // clearCommandBuffer
 #include "cmdtrace.h"
 #include "iso15693tools.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include "graph.h"
 #include "crc16.h"             // iso15 crc
 #include "cmddata.h"           // getsamples

client/src/cmdhffido.c

@@ -31,8 +31,8 @@
 #include "emv/emvcore.h"
 #include "emv/emvjson.h"
 #include "cliparser.h"
-#include "../crypto/asn1utils.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/asn1utils.h"
+#include "crypto/libpcrypto.h"
 #include "fido/cbortools.h"
 #include "fido/fidocore.h"
 #include "emv/dump.h"

client/src/cmdhficlass.c

@@ -19,10 +19,10 @@
 #include "util_posix.h"
 #include "comms.h"
 #include "mbedtls/des.h"
-#include "../loclass/cipherutils.h"
-#include "../loclass/cipher.h"
-#include "../loclass/ikeys.h"
-#include "../loclass/elite_crack.h"
+#include "loclass/cipherutils.h"
+#include "loclass/cipher.h"
+#include "loclass/ikeys.h"
+#include "loclass/elite_crack.h"
 #include "fileutils.h"
 #include "protocols.h"
 #include "cardhelper.h"

client/src/cmdhfmfdes.c

@@ -20,7 +20,7 @@
 #include "cmdhf14a.h"
 #include "mbedtls/des.h"
 #include "mbedtls/aes.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include "protocols.h"
 #include "mifare.h"         // desfire raw command options
 #include "cmdtrace.h"

client/src/cmdhfmfp.c

@@ -25,7 +25,7 @@
 #include "util_posix.h"
 #include "fileutils.h"
 #include "protocols.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001};

client/src/cmdhfmfu.c

@@ -11,7 +11,7 @@
 #include <ctype.h>
 #include "cmdparser.h"
 #include "commonutil.h"
-#include "../crypto/libpcrypto.h"
+#include "crypto/libpcrypto.h"
 #include "mbedtls/des.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"

client/src/cmdsmartcard.c

@@ -19,7 +19,7 @@
 #include "proxmark3.h"
 #include "comms.h"              // getfromdevice
 #include "emv/emvcore.h"        // decodeTVL
-#include "../crypto/libpcrypto.h"  // sha512hash
+#include "crypto/libpcrypto.h"  // sha512hash
 #include "emv/dump.h"
 #include "ui.h"
 #include "fileutils.h"

client/src/comms.c

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "uart.h"
+#include "uart/uart.h"
 #include "ui.h"
 #include "crc16.h"
 #include "util_posix.h" // msclock