X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=mkfiles%2Fubi.mk;h=dd68d2e6ad98b8ba139e73663a0957827d7b4523;hp=06ca2911791592530b53096ed0607eeeeda192c6;hb=eb0cafe05ab4cdf60878dbd81e4ff3712d5150f2;hpb=56a151edecefbaeab43dac22c89a3bb9fe4f470e

diff --git a/mkfiles/ubi.mk b/mkfiles/ubi.mk
index 06ca291..dd68d2e 100644
--- a/mkfiles/ubi.mk
+++ b/mkfiles/ubi.mk
@@ -1,14 +1,16 @@
-# Makefile for noekeon
-ALGO_NAME := UBI_C
+# Makefile for UBI
+ALGO_NAME := UBI
 
-# comment out the following line for removement of threefish from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
+# comment out the following line for removement of ubi from the build process
+AUX += $(ALGO_NAME)
 
-
-$(ALGO_NAME)_OBJ      := threefish256_enc.o threefish512_enc.o threefish1024_enc.o \
-                         ubi256.o ubi512.o ubi1024.o memxor.o
-$(ALGO_NAME)_TEST_BIN := main-ubi-test.o debug.o uart.o hexdigit_tab.o  \
-                         dbz_strings.o nessie_common.o cli.o string-extras.o performance_test.o
+$(ALGO_NAME)_DIR      := skein/
+$(ALGO_NAME)_INCDIR   := memxor/ bcal/
+$(ALGO_NAME)_OBJ      := threefish_mix.o threefish256_enc_asm.o ubi256_asm.o \
+                         threefish512_enc_asm.o ubi512_asm.o threefish1024_enc_asm.o \
+                         ubi1024_asm.o memxor.o
+$(ALGO_NAME)_TESTBIN  := main-ubi-test.o $(CLI_STD) \
+                         nessie_common.o performance_test.o
 $(ALGO_NAME)_NESSIE_TEST      := test nessie
 $(ALGO_NAME)_PERFORMANCE_TEST := performance