From 6c6f0a00686f05d171128a5617869e605bff8cfd Mon Sep 17 00:00:00 2001 From: yparitcher Date: Sun, 6 Jan 2019 23:15:43 -0500 Subject: [PATCH] fix Makefile, Travis make --- .travis.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 355c060..5a81240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,4 +14,4 @@ before_install: - sudo apt-get install -y gcc-arm-embedded script: - export CC=gcc-7 - - make test + - make travis diff --git a/Makefile b/Makefile index 23b6308..126cdb6 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ EFM32_DEBUGGER= -s 440083537 --device EFM32JG1B200F128GM32 #EFM32_DEBUGGER= -s 440121060 #dev board src = $(wildcard pc/*.c) $(wildcard fido2/*.c) $(wildcard crypto/sha256/*.c) crypto/tiny-AES-c/aes.c -obj = $(src:.c=.o) uECC.o +obj = $(src:.c=.o) crypto/micro-ecc/uECC.o LIBCBOR = tinycbor/lib/libtinycbor.a @@ -72,7 +72,7 @@ efm32bootprog: efm32com $(name): $(obj) $(LIBCBOR) $(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS) -uECC.o: ./crypto/micro-ecc/uECC.c +crypto/micro-ecc/uECC.o: ./crypto/micro-ecc/uECC.c $(CC) -c -o $@ $^ -O2 -fdata-sections -ffunction-sections -DuECC_PLATFORM=$(ecc_platform) -I./crypto/micro-ecc/ env2: