github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 10:37:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Philippe Teuwen 2020-04-19 12:53:46 +02:00
commit 2676740fb3
11 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/CMakeLists.txt
View file

@ -244,7 +244,6 @@ target_include_directories(proxmark3 PRIVATE
../common
../include
src
src/uart
)
if (APPLE)

8
client/Makefile
View file

@ -17,7 +17,7 @@ include ../Makefile.defs
INSTALLBIN = proxmark3
INSTALLSHARE = cmdscripts lualibs luascripts resources dictionaries
VPATH = ../common src/uart src
VPATH = ../common src
vpath %.dic dictionaries
OBJDIR = obj
@ -54,7 +54,7 @@ ZLIBPATH = ../common/zlib
ZLIB = $(OBJDIR)/libz.a
LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH) -I$(CLIPARSERPATH)
INCLUDES_CLIENT = -I./src -I../include -I../common -I./src/uart $(LIBS)
INCLUDES_CLIENT = -I./src -I../include -I../common $(LIBS)
CFLAGS ?= -Wall -Werror -O3
# We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT)
@ -129,8 +129,8 @@ DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td
# make temporary to final dependency files after successful compilation
POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d && $(TOUCH) $@
CORESRCS = uart_posix.c \
uart_win32.c \
CORESRCS = uart/uart_posix.c \
uart/uart_win32.c \
ui.c \
commonutil.c \
util.c \

2
client/src/cmddata.c
View file

@ -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"

2
client/src/cmdhf15.c
View file

@ -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

4
client/src/cmdhffido.c
View file

@ -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"

8
client/src/cmdhficlass.c
View file

@ -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"

2
client/src/cmdhfmfdes.c
View file

@ -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"

2
client/src/cmdhfmfp.c
View file

@ -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};

2
client/src/cmdhfmfu.c
View file

@ -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"

2
client/src/cmdsmartcard.c
View file

@ -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"

2
client/src/comms.c
View file

@ -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