-# 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)_TEST_BIN := main-ubi-test.o $(CLI_STD) \
+ nessie_common.o performance_test.o
$(ALGO_NAME)_NESSIE_TEST := test nessie
$(ALGO_NAME)_PERFORMANCE_TEST := performance