arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-25 07:48:10 +00:00
Code Issues Releases Wiki Activity

Makefile: simplify include path, move subdirs to where used in C files

Browse Source
This commit is contained in:
Peter D. Gray 2018-01-12 11:24:47 -05:00 committed by Pavol Rusnak
parent a54c5fe89e
commit cb8c910a0c
7 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -24,9 +24,6 @@ CFLAGS += $(OPTFLAGS) \
-Werror -Werror
CFLAGS += -I. CFLAGS += -I.
CFLAGS += -Iaes
CFLAGS += -Ichacha20poly1305
CFLAGS += -Ied25519-donna
CFLAGS += -DUSE_ETHEREUM=1 CFLAGS += -DUSE_ETHEREUM=1
CFLAGS += -DUSE_GRAPHENE=1 CFLAGS += -DUSE_GRAPHENE=1
CFLAGS += -DUSE_NEM=1 CFLAGS += -DUSE_NEM=1
@ -56,7 +53,7 @@ SRCS += segwit_addr.c
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
TESTLIBS = $(shell pkg-config --libs check) -lrt -lpthread -lm TESTLIBS = $(shell pkg-config --libs check) -lpthread -lm
TESTSSLLIBS = -lcrypto TESTSSLLIBS = -lcrypto
all: test_check test_openssl test_speed aes/aestst tools libtrezor-crypto.so all: test_check test_openssl test_speed aes/aestst tools libtrezor-crypto.so

8
bip32.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#include "aes.h" #include "aes/aes.h"
#include "address.h" #include "address.h"
#include "bignum.h" #include "bignum.h"
#include "hmac.h" #include "hmac.h"
@ -39,10 +39,10 @@
#include "curves.h" #include "curves.h"
#include "secp256k1.h" #include "secp256k1.h"
#include "nist256p1.h" #include "nist256p1.h"
#include "ed25519.h" #include "ed25519-donna/ed25519.h"
#include "ed25519-sha3.h" #include "ed25519-donna/ed25519-sha3.h"
#if USE_KECCAK #if USE_KECCAK
#include "ed25519-keccak.h" #include "ed25519-donna/ed25519-keccak.h"
#endif #endif
#if USE_NEM #if USE_NEM
#include "nem.h" #include "nem.h"

2
bip32.h
View File

@ -28,7 +28,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include "ecdsa.h" #include "ecdsa.h"
#include "ed25519.h" #include "ed25519-donna/ed25519.h"
#include "options.h" #include "options.h"
typedef struct { typedef struct {

2
nem.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include "base32.h" #include "base32.h"
#include "ed25519-keccak.h" #include "ed25519-donna/ed25519-keccak.h"
#include "macros.h" #include "macros.h"
#include "ripemd160.h" #include "ripemd160.h"
#include "sha3.h" #include "sha3.h"

2
nem.h
View File

@ -28,7 +28,7 @@
#include <stdint.h> #include <stdint.h>
#include "bip32.h" #include "bip32.h"
#include "ed25519.h" #include "ed25519-donna/ed25519.h"
#define NEM_LEVY_PERCENTILE_DIVISOR 4 #define NEM_LEVY_PERCENTILE_DIVISOR 4
#define NEM_MAX_DIVISIBILITY 6 #define NEM_MAX_DIVISIBILITY 6

6
test_check.c
View File

@ -36,7 +36,7 @@
#include "options.h" #include "options.h"
#include "aes.h" #include "aes/aes.h"
#include "bignum.h" #include "bignum.h"
#include "base32.h" #include "base32.h"
#include "base58.h" #include "base58.h"
@ -53,8 +53,8 @@
#include "curves.h" #include "curves.h"
#include "secp256k1.h" #include "secp256k1.h"
#include "nist256p1.h" #include "nist256p1.h"
#include "ed25519.h" #include "ed25519-donna/ed25519.h"
#include "ed25519-keccak.h" #include "ed25519-donna/ed25519-keccak.h"
#include "script.h" #include "script.h"
#include "rfc6979.h" #include "rfc6979.h"
#include "address.h" #include "address.h"

2
test_speed.c
View File

@ -8,7 +8,7 @@
#include "bip32.h" #include "bip32.h"
#include "secp256k1.h" #include "secp256k1.h"
#include "nist256p1.h" #include "nist256p1.h"
#include "ed25519.h" #include "ed25519-donna/ed25519.h"
#include "hasher.h" #include "hasher.h"
static uint8_t msg[256]; static uint8_t msg[256];