-$(ALGO_NAME)_OBJ := mugi.o gf256mul.o aes_sbox.o
-$(ALGO_NAME)_TEST_BIN := main-mugi-test.o debug.o uart.o hexdigit_tab.o \
- nessie_stream_test.o dbz_strings.o nessie_common.o cli.o string-extras.o \
+$(ALGO_NAME)_DIR := mugi/
+$(ALGO_NAME)_INCDIR := memxor/ aes/ gf256mul/
+$(ALGO_NAME)_OBJ := mugi.o gf256mul.o aes_sbox.o memxor.o
+$(ALGO_NAME)_TESTBIN := main-mugi-test.o $(CLI_STD) \
+ nessie_stream_test.o nessie_common.o \