BLOCK_CIPHERS += $(ALGO_NAME)
-$(ALGO_NAME)_OBJ := aes_enc.o aes_dec.o aes_sbox.o aes_invsbox.o aes.o \
+$(ALGO_NAME)_DIR := aes/
+$(ALGO_NAME)_INCDIR := memxor/ gf256mul/ bcal/
+$(ALGO_NAME)_OBJ := aes_enc.o aes_dec.o aes_sbox.o aes_invsbox.o \
aes_keyschedule.o gf256mul.o \
aes128_enc.o aes128_dec.o aes192_enc.o aes192_dec.o \
aes256_enc.o aes256_dec.o
-$(ALGO_NAME)_TEST_BIN := main-aes-test.o debug.o uart.o serial-tools.o \
- nessie_bc_test.o nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_TESTBIN := main-aes-test.o $(CLI_STD) $(BCAL_STD) \
+ bcal_aes128.o bcal_aes192.o bcal_aes256.o bcal-cbc.o \
+ dump-asm.o dump-decl.o bcal-cfb_byte.o \
+ bcal-cfb_bit.o bcal-ofb.o bcal-ctr.o bcal-cmac.o cmacvs.o \
+ bcal-eax.o memxor.o
$(ALGO_NAME)_NESSIE_TEST := test nessie
$(ALGO_NAME)_PERFORMANCE_TEST := performance