-$(ALGO_NAME)_OBJ := cast5.o
-$(ALGO_NAME)_TEST_BIN := main-cast5-test.o debug.o uart.o hexdigit_tab.o serial-tools.o cli.o string-extras.o\
- nessie_bc_test.o dbz_strings.o nessie_common.o performance_test.o
+$(ALGO_NAME)_DIR := cast5/
+$(ALGO_NAME)_INCDIR := bcal/
+$(ALGO_NAME)_OBJ := cast5.o cast5-sbox.o
+$(ALGO_NAME)_TESTBIN := main-cast5-test.o bcal_cast5.o $(CLI_STD) $(BCAL_STD)