From: bg <bg@b1d182e4-1ff8-0310-901f-bddb46175740>
Date: Thu, 3 Jul 2008 12:14:14 +0000 (+0000)
Subject: modyfied build process
X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=commitdiff_plain;h=e048ac1e57d345b12b4019447ddfddfdd3dc52fc

modyfied build process
---

diff --git a/Makefile b/Makefile
index c8a52b7..e725133 100644
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,19 @@ PRNGS          :=
 # we use the gnu make standard library
 include gmsl
 include avr-makefile.inc
-include *.mk
+include mkfiles/*.mk
 
 ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
-ALGORITHMS_OBJ_IMM = $(foreach a, $(ALGORITHMS_OBJ), $($(a)))
+define OBJinBINDIR_TEMPLATE
+$(1) = $(2)
+endef
+$(foreach a, $(ALGORITHMS_OBJ), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
 ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
+$(foreach a, $(ALGORITHMS_TEST_BIN), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
 ALGORITHMS_TEST_BIN_MAIN = $(foreach a, $(ALGORITHMS_TEST_BIN), $(firstword $($(a))))
-ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst %.o, %.elf, $(ALGORITHMS_TEST_BIN_MAIN))
-ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst %.o, %.hex, $(ALGORITHMS_TEST_BIN_MAIN))
+ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.elf, $(ALGORITHMS_TEST_BIN_MAIN))
+ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.hex, $(ALGORITHMS_TEST_BIN_MAIN))
 
 ALGORITHMS_TEST_BIN_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
 ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
@@ -26,7 +30,6 @@ ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
 
 ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
 
-PRG = remove_me
 
 #-------------------------------------------------------------------------------
 
@@ -44,7 +47,7 @@ $(2): $(3)
 	$(LIBS)
 endef
 
-$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst %.o,%.elf,$(firstword $($(algo)_TEST_BIN))), $($(algo)_TEST_BIN) )))
+$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst $(BIN_DIR)%.o,$(TESTBIN_DIR)%.elf,$(firstword $($(algo)_TEST_BIN))), $(patsubst %.o,%.o,$($(algo)_TEST_BIN)) )))
 
 #-------------------------------------------------------------------------------
 
@@ -61,22 +64,18 @@ info:
 	@echo "    $(MACS)"
 	@echo "  PRNG functions:"
 	@echo "    $(PRNGS)"
-#	@echo "  LC functions:"
-#	@echo "    $(ALGORITHMS_LC)"
-	
-#	echo $(ALGORITHMS_TEST_BIN_MAIN)
-#	echo $(ALGORITHMS)
-#	echo $(firstword $(XTEA_TEST_BIN))
-#	echo $(patsubst %.o,%.elf,$(firstword $(XTEA_TEST_BIN)))
-#	echo $(ALGORITHMS_OBJ)
-#	echo $(ALGORITHMS_OBJ_IMM)
-#	echo $(ALGORITHMS_TEST_BIN)
-#	echo $(ALGORITHMS_NESSIE_TEST)
-#	echo $(ALGORITHMS_PERFORMANCE_TEST)
+
+$(BIN_DIR)%.o: %.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
+
+$(BIN_DIR)%.o: %.S
+	@echo "[as] :  $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
 
 %.o: %.c
 	@echo "[gcc]:  $@"
-	@$(CC) $(CFLAGS) -c	-o $@ $<
+	@$(CC) $(CFLAGS)  -c -o $@ $<
 
 %.o: %.S
 	@echo "[as] :  $@"
@@ -107,7 +106,6 @@ tests: $(ALGORITHMS_TEST_BIN) \
 
 .PHONY:  stats
 stats: $(SIZESTAT_FILE)
-#$(patsubst %, %_size.txt, $(ALGORITHMS_LC))
 	
 	
 $(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
@@ -158,28 +156,20 @@ $(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), \
 
 .PHONY: clean
 clean:
-	rm -rf *.o *.elf *.eps *.png *.pdf *.bak *_size.txt
+	rm -rf $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak *_size.txt
 	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
 xclean: clean
-	rm -rf *.d
+	rm -rf $(DEP_DIR)*.d
 
 flash:
 	$(ERASECMD)
 	$(FLASHCMD)
-	
-lst:  $(PRG).lst
 
 %.lst: %.elf
 	$(OBJDUMP) -h -S $< > $@
 
 # Rules for building the .text rom images
 
-text: hex bin srec
-
-hex:  $(PRG).hex
-bin:  $(PRG).bin
-srec: $(PRG).srec
-
 %.hex: %.elf
 	$(OBJCOPY) -j .text -j .data -O ihex $< $@
 
@@ -191,11 +181,6 @@ srec: $(PRG).srec
 
 # Rules for building the .eeprom rom images
 
-eeprom: ehex ebin esrec
-
-ehex:  $(PRG)_eeprom.hex
-ebin:  $(PRG)_eeprom.bin
-esrec: $(PRG)_eeprom.srec
 
 %_eeprom.hex: %.elf
 	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
@@ -213,12 +198,6 @@ esrec: $(PRG)_eeprom.srec
 FIG2DEV		 = fig2dev
 EXTRA_CLEAN_FILES       = *.hex *.bin *.srec
 
-dox: eps png pdf
-
-eps: $(PRG).eps
-png: $(PRG).png
-pdf: $(PRG).pdf
-
 
 %.eps: %.fig
 	$(FIG2DEV) -L eps $< $@
@@ -230,7 +209,8 @@ pdf: $(PRG).pdf
 	$(FIG2DEV) -L png $< $@
 
 
-DEPS := $(wildcard *.d)
+DEPS := $(wildcard $(DEP_DIR)*.d)
+
 ifneq ($(DEPS),)
 include $(DEPS)
 endif
diff --git a/arcfour.mk b/arcfour.mk
deleted file mode 100644
index a05f236..0000000
--- a/arcfour.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for ARCFOUR (RC4 compatible)
-ALGO_NAME := ARCFOUR
-
-# comment out the following line for removement of ARCFOUR from the build process
-STREAM_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := arcfour-asm.o
-$(ALGO_NAME)_TEST_BIN := main-arcfour-test.o debug.o uart.o serial-tools.o \
-                         nessie_stream_test.o nessie_common.o arcfour-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/avr-makefile.inc b/avr-makefile.inc
index 0fe9e4f..f0ea6c8 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -4,13 +4,15 @@ MCU_TARGET     = atmega644
 OPTIMIZE       = -Os
 DEFS           = -D$(call uc, $(MCU_TARGET))
 FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:# no space at the end
-
+DEP_DIR        = deps/
+BIN_DIR        = bin/
+TESTBIN_DIR    = test_bin/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
 ERASECMD       = 
 
 CC	     = avr-gcc
 
-override CFLAGS	= -MMD -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS	= -MMD -MF$(DEP_DIR)$(patsubst %.c,%.d,$^) -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
 override LDFLAGS       = -Wl,-Map,
 override ASFLAGS	   = -mmcu=$(MCU_TARGET)
diff --git a/camellia.mk b/camellia.mk
deleted file mode 100644
index 06d99d6..0000000
--- a/camellia.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for camellia
-ALGO_NAME := CAMELLIA
-
-# comment out the following line for removement of serpent from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-# main-camellia-test.o debug.o uart.o serial-tools.o camellia.o camellia-asm.o
-$(ALGO_NAME)_OBJ      := camellia.o camellia-asm.o
-$(ALGO_NAME)_TEST_BIN := main-camellia-test.o debug.o uart.o serial-tools.o \
-                         camellia.o camellia-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/cast5.mk b/cast5.mk
deleted file mode 100644
index b2b671b..0000000
--- a/cast5.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for CAST5
-ALGO_NAME := CAST5
-
-# comment out the following line for removement of CAST5 from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := cast5.o
-$(ALGO_NAME)_TEST_BIN := main-cast5-test.o debug.o uart.o serial-tools.o cli.o\
-                         cast5.o nessie_bc_test.o nessie_common.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/des.mk b/des.mk
deleted file mode 100644
index 2cc8d7c..0000000
--- a/des.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for DES
-ALGO_NAME := DES
-
-# comment out the following line for removement of DES from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := des.o
-$(ALGO_NAME)_TEST_BIN := main-des-test.o debug.o uart.o serial-tools.o des.o \
-                         nessie_bc_test.o nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/entropium.mk b/entropium.mk
deleted file mode 100644
index 589ff6f..0000000
--- a/entropium.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for Entropium PRNG
-ALGO_NAME := ENTROPIUM
-
-# comment out the following line for removement of PRNG from the build process
-PRNGS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := entropium.o sha256-asm.o
-$(ALGO_NAME)_TEST_BIN := main-entropium-test.o debug.o uart.o serial-tools.o \
-                         sha256-asm.o entropium.o cli.o performance_test.o
-                         
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/grain.mk b/grain.mk
deleted file mode 100644
index ed330a6..0000000
--- a/grain.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for Grain
-ALGO_NAME := GRAIN
-
-# comment out the following line for removement of Grain from the build process
-STREAM_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := grain.o
-$(ALGO_NAME)_TEST_BIN := main-grain-test.o debug.o uart.o serial-tools.o \
-                         nessie_stream_test.o nessie_common.o grain.o cli.o \
-			 performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/hmac-sha256.mk b/hmac-sha256.mk
deleted file mode 100644
index 6d957b3..0000000
--- a/hmac-sha256.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for HMAC-SHA256
-ALGO_NAME := HMAC-SHA256
-
-# comment out the following line for removement of HMAC-SHA256 from the build process
-MACS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := hmac-sha256.o sha256-asm.o
-$(ALGO_NAME)_TEST_BIN := main-hmac-sha256-test.o debug.o uart.o serial-tools.o \
-                         hmac-sha256.o sha256-asm.o nessie_mac_test.o nessie_common.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/md5.mk b/md5.mk
deleted file mode 100644
index e6aeaa4..0000000
--- a/md5.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile for MD5
-ALGO_NAME := MD5
-
-# comment out the following line for removement of MD5 from the build process
-HASHES += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := md5.o
-$(ALGO_NAME)_TEST_BIN := main-md5-test.o debug.o uart.o serial-tools.o md5.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/mkfiles/arcfour.mk b/mkfiles/arcfour.mk
new file mode 100644
index 0000000..a05f236
--- /dev/null
+++ b/mkfiles/arcfour.mk
@@ -0,0 +1,12 @@
+# Makefile for ARCFOUR (RC4 compatible)
+ALGO_NAME := ARCFOUR
+
+# comment out the following line for removement of ARCFOUR from the build process
+STREAM_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := arcfour-asm.o
+$(ALGO_NAME)_TEST_BIN := main-arcfour-test.o debug.o uart.o serial-tools.o \
+                         nessie_stream_test.o nessie_common.o arcfour-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/camellia.mk b/mkfiles/camellia.mk
new file mode 100644
index 0000000..06d99d6
--- /dev/null
+++ b/mkfiles/camellia.mk
@@ -0,0 +1,13 @@
+# Makefile for camellia
+ALGO_NAME := CAMELLIA
+
+# comment out the following line for removement of serpent from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+# main-camellia-test.o debug.o uart.o serial-tools.o camellia.o camellia-asm.o
+$(ALGO_NAME)_OBJ      := camellia.o camellia-asm.o
+$(ALGO_NAME)_TEST_BIN := main-camellia-test.o debug.o uart.o serial-tools.o \
+                         camellia.o camellia-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/cast5.mk b/mkfiles/cast5.mk
new file mode 100644
index 0000000..b2b671b
--- /dev/null
+++ b/mkfiles/cast5.mk
@@ -0,0 +1,12 @@
+# Makefile for CAST5
+ALGO_NAME := CAST5
+
+# comment out the following line for removement of CAST5 from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := cast5.o
+$(ALGO_NAME)_TEST_BIN := main-cast5-test.o debug.o uart.o serial-tools.o cli.o\
+                         cast5.o nessie_bc_test.o nessie_common.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/des.mk b/mkfiles/des.mk
new file mode 100644
index 0000000..2cc8d7c
--- /dev/null
+++ b/mkfiles/des.mk
@@ -0,0 +1,12 @@
+# Makefile for DES
+ALGO_NAME := DES
+
+# comment out the following line for removement of DES from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := des.o
+$(ALGO_NAME)_TEST_BIN := main-des-test.o debug.o uart.o serial-tools.o des.o \
+                         nessie_bc_test.o nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/entropium.mk b/mkfiles/entropium.mk
new file mode 100644
index 0000000..589ff6f
--- /dev/null
+++ b/mkfiles/entropium.mk
@@ -0,0 +1,13 @@
+# Makefile for Entropium PRNG
+ALGO_NAME := ENTROPIUM
+
+# comment out the following line for removement of PRNG from the build process
+PRNGS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := entropium.o sha256-asm.o
+$(ALGO_NAME)_TEST_BIN := main-entropium-test.o debug.o uart.o serial-tools.o \
+                         sha256-asm.o entropium.o cli.o performance_test.o
+                         
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/grain.mk b/mkfiles/grain.mk
new file mode 100644
index 0000000..ed330a6
--- /dev/null
+++ b/mkfiles/grain.mk
@@ -0,0 +1,13 @@
+# Makefile for Grain
+ALGO_NAME := GRAIN
+
+# comment out the following line for removement of Grain from the build process
+STREAM_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := grain.o
+$(ALGO_NAME)_TEST_BIN := main-grain-test.o debug.o uart.o serial-tools.o \
+                         nessie_stream_test.o nessie_common.o grain.o cli.o \
+			 performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/hmac-sha256.mk b/mkfiles/hmac-sha256.mk
new file mode 100644
index 0000000..6d957b3
--- /dev/null
+++ b/mkfiles/hmac-sha256.mk
@@ -0,0 +1,12 @@
+# Makefile for HMAC-SHA256
+ALGO_NAME := HMAC-SHA256
+
+# comment out the following line for removement of HMAC-SHA256 from the build process
+MACS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := hmac-sha256.o sha256-asm.o
+$(ALGO_NAME)_TEST_BIN := main-hmac-sha256-test.o debug.o uart.o serial-tools.o \
+                         hmac-sha256.o sha256-asm.o nessie_mac_test.o nessie_common.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/md5.mk b/mkfiles/md5.mk
new file mode 100644
index 0000000..e6aeaa4
--- /dev/null
+++ b/mkfiles/md5.mk
@@ -0,0 +1,11 @@
+# Makefile for MD5
+ALGO_NAME := MD5
+
+# comment out the following line for removement of MD5 from the build process
+HASHES += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := md5.o
+$(ALGO_NAME)_TEST_BIN := main-md5-test.o debug.o uart.o serial-tools.o md5.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/mickey128.mk b/mkfiles/mickey128.mk
new file mode 100644
index 0000000..3cb7a42
--- /dev/null
+++ b/mkfiles/mickey128.mk
@@ -0,0 +1,12 @@
+# Makefile for Mickey128
+ALGO_NAME := MICKEY128
+
+# comment out the following line for removement of Mickey128 from the build process
+STREAM_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := mickey128.o
+$(ALGO_NAME)_TEST_BIN := main-mickey128-test.o debug.o uart.o serial-tools.o \
+                         nessie_stream_test.o nessie_common.o mickey128.o cli.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/noekeon.mk b/mkfiles/noekeon.mk
new file mode 100644
index 0000000..3f1a313
--- /dev/null
+++ b/mkfiles/noekeon.mk
@@ -0,0 +1,14 @@
+# Makefile for noekeon
+ALGO_NAME := NOEKEON
+
+# comment out the following line for removement of noekeon from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := noekeon_asm.o
+$(ALGO_NAME)_TEST_BIN := main-noekeon-test.o debug.o uart.o serial-tools.o \
+                         noekeon_asm.o nessie_bc_test.o \
+                         nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := test nessie
+$(ALGO_NAME)_PEROFRMANCE_TEST := performance
+
diff --git a/mkfiles/present.mk b/mkfiles/present.mk
new file mode 100644
index 0000000..764acef
--- /dev/null
+++ b/mkfiles/present.mk
@@ -0,0 +1,14 @@
+# Makefile for present
+ALGO_NAME := PRESENT
+
+# comment out the following line for removement of present from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := present.o
+$(ALGO_NAME)_TEST_BIN := main-present-test.o debug.o uart.o serial-tools.o \
+                         present.o nessie_bc_test.o nessie_common.o cli.o \
+			 performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/rc5.mk b/mkfiles/rc5.mk
new file mode 100644
index 0000000..b45a610
--- /dev/null
+++ b/mkfiles/rc5.mk
@@ -0,0 +1,14 @@
+# Makefile for RC5
+ALGO_NAME := RC5
+
+# comment out the following line for removement of RC5 from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := rc5.o
+$(ALGO_NAME)_TEST_BIN := main-rc5-test.o debug.o uart.o serial-tools.o \
+                         rc5.o nessie_bc_test.o \
+                         nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := test nessie
+$(ALGO_NAME)_PEROFRMANCE_TEST := performance
+
diff --git a/mkfiles/rc6.mk b/mkfiles/rc6.mk
new file mode 100644
index 0000000..893b34f
--- /dev/null
+++ b/mkfiles/rc6.mk
@@ -0,0 +1,14 @@
+# Makefile for RC6
+ALGO_NAME := RC6
+
+# comment out the following line for removement of RC6 from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := rc6.o
+$(ALGO_NAME)_TEST_BIN := main-rc6-test.o debug.o uart.o serial-tools.o \
+                         rc6.o nessie_bc_test.o \
+                         nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := test nessie
+$(ALGO_NAME)_PEROFRMANCE_TEST := performance
+
diff --git a/mkfiles/seed.mk b/mkfiles/seed.mk
new file mode 100644
index 0000000..37888a5
--- /dev/null
+++ b/mkfiles/seed.mk
@@ -0,0 +1,12 @@
+# Makefile for SEED
+ALGO_NAME := SEED
+
+# comment out the following line for removement of SEED from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := seed.o seed-asm.o
+$(ALGO_NAME)_TEST_BIN := main-seed-test.o debug.o uart.o serial-tools.o \
+                         seed.o seed-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/serpent.mk b/mkfiles/serpent.mk
new file mode 100644
index 0000000..2d4ff89
--- /dev/null
+++ b/mkfiles/serpent.mk
@@ -0,0 +1,14 @@
+# Makefile for serpent
+ALGO_NAME := SERPENT
+
+# comment out the following line for removement of serpent from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := serpent.o serpent-sboxes-bitslice.o
+$(ALGO_NAME)_TEST_BIN := main-serpent-test.o debug.o uart.o serial-tools.o \
+                         serpent.o serpent-sboxes-bitslice.o nessie_bc_test.o \
+                         nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/sha1.mk b/mkfiles/sha1.mk
new file mode 100644
index 0000000..96595e9
--- /dev/null
+++ b/mkfiles/sha1.mk
@@ -0,0 +1,12 @@
+# Makefile for SHA1
+ALGO_NAME := SHA1
+
+# comment out the following line for removement of SHA1 from the build process
+HASHES += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := sha1-asm.o
+$(ALGO_NAME)_TEST_BIN := main-sha1-test.o debug.o uart.o serial-tools.o \
+                         sha1-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/sha256.mk b/mkfiles/sha256.mk
new file mode 100644
index 0000000..9d9dbaa
--- /dev/null
+++ b/mkfiles/sha256.mk
@@ -0,0 +1,12 @@
+# Makefile for SHA256
+ALGO_NAME := SHA256
+
+# comment out the following line for removement of SHA256 from the build process
+HASHES += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := sha256-asm.o
+$(ALGO_NAME)_TEST_BIN := main-sha256-test.o debug.o uart.o serial-tools.o \
+                         sha256-asm.o nessie_hash_test.o nessie_common.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/shabea.mk b/mkfiles/shabea.mk
new file mode 100644
index 0000000..3accd1f
--- /dev/null
+++ b/mkfiles/shabea.mk
@@ -0,0 +1,12 @@
+# Makefile for SHABEA
+ALGO_NAME := SHABEA
+
+# comment out the following line for removement of SHABEA from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := shabea.o sha256-asm.o
+$(ALGO_NAME)_TEST_BIN := main-shabea-test.o debug.o uart.o serial-tools.o \
+                         shabea.o sha256-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/shacal1enc.mk b/mkfiles/shacal1enc.mk
new file mode 100644
index 0000000..1e19794
--- /dev/null
+++ b/mkfiles/shacal1enc.mk
@@ -0,0 +1,14 @@
+# Makefile for present
+ALGO_NAME := SHACAL1ENC
+
+# comment out the following line for removement of present from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := shacal1_enc.o sha1-asm.o
+$(ALGO_NAME)_TEST_BIN := main-shacal1_enc-test.o debug.o uart.o serial-tools.o \
+                         nessie_bc_test.o nessie_common.o cli.o \
+			 performance_test.o shacal1_enc.o sha1-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/shacal2enc.mk b/mkfiles/shacal2enc.mk
new file mode 100644
index 0000000..44ba529
--- /dev/null
+++ b/mkfiles/shacal2enc.mk
@@ -0,0 +1,14 @@
+# Makefile for present
+ALGO_NAME := SHACAL2ENC
+
+# comment out the following line for removement of present from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+
+$(ALGO_NAME)_OBJ      := shacal2_enc.o sha256-asm.o
+$(ALGO_NAME)_TEST_BIN := main-shacal2_enc-test.o debug.o uart.o serial-tools.o \
+                         nessie_bc_test.o nessie_common.o cli.o \
+			 performance_test.o shacal2_enc.o sha256-asm.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/skipjack.mk b/mkfiles/skipjack.mk
new file mode 100644
index 0000000..a04ba8a
--- /dev/null
+++ b/mkfiles/skipjack.mk
@@ -0,0 +1,12 @@
+# Makefile for SKIPJACK
+ALGO_NAME := SKIPJACK
+
+# comment out the following line for removement of skipjack from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := skipjack.o
+$(ALGO_NAME)_TEST_BIN := main-skipjack-test.o debug.o uart.o serial-tools.o \
+                         skipjack.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/tdes.mk b/mkfiles/tdes.mk
new file mode 100644
index 0000000..66b5168
--- /dev/null
+++ b/mkfiles/tdes.mk
@@ -0,0 +1,12 @@
+# Makefile for DES
+ALGO_NAME := TDES
+
+# comment out the following line for removement of DES from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := des.o
+$(ALGO_NAME)_TEST_BIN := main-tdes-test.o debug.o uart.o serial-tools.o des.o \
+                         nessie_bc_test.o nessie_common.o cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/trivium.mk b/mkfiles/trivium.mk
new file mode 100644
index 0000000..e2e3484
--- /dev/null
+++ b/mkfiles/trivium.mk
@@ -0,0 +1,13 @@
+# Makefile for Trivium
+ALGO_NAME := TRIVIUM
+
+# comment out the following line for removement of Trivium from the build process
+STREAM_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := trivium.o
+$(ALGO_NAME)_TEST_BIN := main-trivium-test.o debug.o uart.o serial-tools.o \
+                         nessie_stream_test.o nessie_common.o trivium.o cli.o \
+			 performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/mkfiles/xtea.mk b/mkfiles/xtea.mk
new file mode 100644
index 0000000..38f485b
--- /dev/null
+++ b/mkfiles/xtea.mk
@@ -0,0 +1,13 @@
+# Makefile for XTEA
+ALGO_NAME := XTEA
+
+# comment out the following line for removement of XTEA from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_OBJ      := xtea-asm.o
+$(ALGO_NAME)_TEST_BIN := main-xtea-test.o debug.o uart.o serial-tools.o \
+                         xtea-asm.o nessie_bc_test.o nessie_common.o \
+			 cli.o performance_test.o
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
+
diff --git a/noekeon.mk b/noekeon.mk
deleted file mode 100644
index 3f1a313..0000000
--- a/noekeon.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for noekeon
-ALGO_NAME := NOEKEON
-
-# comment out the following line for removement of noekeon from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := noekeon_asm.o
-$(ALGO_NAME)_TEST_BIN := main-noekeon-test.o debug.o uart.o serial-tools.o \
-                         noekeon_asm.o nessie_bc_test.o \
-                         nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := test nessie
-$(ALGO_NAME)_PEROFRMANCE_TEST := performance
-
diff --git a/present.mk b/present.mk
deleted file mode 100644
index 764acef..0000000
--- a/present.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for present
-ALGO_NAME := PRESENT
-
-# comment out the following line for removement of present from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := present.o
-$(ALGO_NAME)_TEST_BIN := main-present-test.o debug.o uart.o serial-tools.o \
-                         present.o nessie_bc_test.o nessie_common.o cli.o \
-			 performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/rc5.mk b/rc5.mk
deleted file mode 100644
index b45a610..0000000
--- a/rc5.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for RC5
-ALGO_NAME := RC5
-
-# comment out the following line for removement of RC5 from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := rc5.o
-$(ALGO_NAME)_TEST_BIN := main-rc5-test.o debug.o uart.o serial-tools.o \
-                         rc5.o nessie_bc_test.o \
-                         nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := test nessie
-$(ALGO_NAME)_PEROFRMANCE_TEST := performance
-
diff --git a/rc6.mk b/rc6.mk
deleted file mode 100644
index 893b34f..0000000
--- a/rc6.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for RC6
-ALGO_NAME := RC6
-
-# comment out the following line for removement of RC6 from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := rc6.o
-$(ALGO_NAME)_TEST_BIN := main-rc6-test.o debug.o uart.o serial-tools.o \
-                         rc6.o nessie_bc_test.o \
-                         nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := test nessie
-$(ALGO_NAME)_PEROFRMANCE_TEST := performance
-
diff --git a/seed.mk b/seed.mk
deleted file mode 100644
index 37888a5..0000000
--- a/seed.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for SEED
-ALGO_NAME := SEED
-
-# comment out the following line for removement of SEED from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := seed.o seed-asm.o
-$(ALGO_NAME)_TEST_BIN := main-seed-test.o debug.o uart.o serial-tools.o \
-                         seed.o seed-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/serpent.mk b/serpent.mk
deleted file mode 100644
index 2d4ff89..0000000
--- a/serpent.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for serpent
-ALGO_NAME := SERPENT
-
-# comment out the following line for removement of serpent from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := serpent.o serpent-sboxes-bitslice.o
-$(ALGO_NAME)_TEST_BIN := main-serpent-test.o debug.o uart.o serial-tools.o \
-                         serpent.o serpent-sboxes-bitslice.o nessie_bc_test.o \
-                         nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/sha1.mk b/sha1.mk
deleted file mode 100644
index 96595e9..0000000
--- a/sha1.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for SHA1
-ALGO_NAME := SHA1
-
-# comment out the following line for removement of SHA1 from the build process
-HASHES += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := sha1-asm.o
-$(ALGO_NAME)_TEST_BIN := main-sha1-test.o debug.o uart.o serial-tools.o \
-                         sha1-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/sha256.mk b/sha256.mk
deleted file mode 100644
index 9d9dbaa..0000000
--- a/sha256.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for SHA256
-ALGO_NAME := SHA256
-
-# comment out the following line for removement of SHA256 from the build process
-HASHES += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := sha256-asm.o
-$(ALGO_NAME)_TEST_BIN := main-sha256-test.o debug.o uart.o serial-tools.o \
-                         sha256-asm.o nessie_hash_test.o nessie_common.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/shabea.mk b/shabea.mk
deleted file mode 100644
index 3accd1f..0000000
--- a/shabea.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for SHABEA
-ALGO_NAME := SHABEA
-
-# comment out the following line for removement of SHABEA from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := shabea.o sha256-asm.o
-$(ALGO_NAME)_TEST_BIN := main-shabea-test.o debug.o uart.o serial-tools.o \
-                         shabea.o sha256-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/shacal1enc.mk b/shacal1enc.mk
deleted file mode 100644
index 1e19794..0000000
--- a/shacal1enc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for present
-ALGO_NAME := SHACAL1ENC
-
-# comment out the following line for removement of present from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := shacal1_enc.o sha1-asm.o
-$(ALGO_NAME)_TEST_BIN := main-shacal1_enc-test.o debug.o uart.o serial-tools.o \
-                         nessie_bc_test.o nessie_common.o cli.o \
-			 performance_test.o shacal1_enc.o sha1-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/shacal2enc.mk b/shacal2enc.mk
deleted file mode 100644
index 44ba529..0000000
--- a/shacal2enc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile for present
-ALGO_NAME := SHACAL2ENC
-
-# comment out the following line for removement of present from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-
-$(ALGO_NAME)_OBJ      := shacal2_enc.o sha256-asm.o
-$(ALGO_NAME)_TEST_BIN := main-shacal2_enc-test.o debug.o uart.o serial-tools.o \
-                         nessie_bc_test.o nessie_common.o cli.o \
-			 performance_test.o shacal2_enc.o sha256-asm.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/skipjack.mk b/skipjack.mk
deleted file mode 100644
index a04ba8a..0000000
--- a/skipjack.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for SKIPJACK
-ALGO_NAME := SKIPJACK
-
-# comment out the following line for removement of skipjack from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := skipjack.o
-$(ALGO_NAME)_TEST_BIN := main-skipjack-test.o debug.o uart.o serial-tools.o \
-                         skipjack.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/tdes.mk b/tdes.mk
deleted file mode 100644
index 66b5168..0000000
--- a/tdes.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for DES
-ALGO_NAME := TDES
-
-# comment out the following line for removement of DES from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := des.o
-$(ALGO_NAME)_TEST_BIN := main-tdes-test.o debug.o uart.o serial-tools.o des.o \
-                         nessie_bc_test.o nessie_common.o cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/trivium.mk b/trivium.mk
deleted file mode 100644
index e2e3484..0000000
--- a/trivium.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for Trivium
-ALGO_NAME := TRIVIUM
-
-# comment out the following line for removement of Trivium from the build process
-STREAM_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := trivium.o
-$(ALGO_NAME)_TEST_BIN := main-trivium-test.o debug.o uart.o serial-tools.o \
-                         nessie_stream_test.o nessie_common.o trivium.o cli.o \
-			 performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-
diff --git a/xtea.mk b/xtea.mk
deleted file mode 100644
index 38f485b..0000000
--- a/xtea.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Makefile for XTEA
-ALGO_NAME := XTEA
-
-# comment out the following line for removement of XTEA from the build process
-BLOCK_CIPHERS += $(ALGO_NAME)
-
-$(ALGO_NAME)_OBJ      := xtea-asm.o
-$(ALGO_NAME)_TEST_BIN := main-xtea-test.o debug.o uart.o serial-tools.o \
-                         xtea-asm.o nessie_bc_test.o nessie_common.o \
-			 cli.o performance_test.o
-$(ALGO_NAME)_NESSIE_TEST      := "nessie"
-$(ALGO_NAME)_PEROFRMANCE_TEST := "performance"
-