X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=561f84e7382fd80ddd161b3c9f7d2937466536de;hb=2f9b301c15c03faa76b7f9c95b18eadaa8d013ae;hp=fc639241f84cb39b5fc2f9b766442e0fe19abf5a;hpb=bfac0f0eef1c956bf6fbc023708f17ecfda9b39d;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index fc63924..561f84e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,150 +1,296 @@
-# Makefile for the micro-crypt project
+# Makefile for the AVR-Crypto-Lib project
 # author: Daniel Otte
-
-BLOCK_CIPHERS  = 
-STREAM_CIPHERS = 
-HASHES         = 
-
-
+SHELL = sh
+
+BLOCK_CIPHERS  :=
+STREAM_CIPHERS :=
+HASHES         :=
+MACS           :=
+PRNGS          :=
+ENCODINGS      :=
+AUX            :=
+
+# we use the gnu make standard library
+include gmsl
 include avr-makefile.inc
-include *.mk
 
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES)
+#-------------------------------------------------------------------------------
+# inclusion of make stubs
+include mkfiles/*.mk
+
+#-------------------------------------------------------------------------------
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) \
+			 $(ENCODINGS) $(AUX)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
-ALGORITHMS_OBJ_IMM = $(foreach a, $(ALGORITHMS_OBJ), $($(a)))
 ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
-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_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
-ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
-ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
+#-------------------------------------------------------------------------------
+# define binary object in $(BIN_DIR)$(ALGO)/<obj>
+define Assert_Template
+$(1) = $(2)
+endef
 
+$(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
+    $(a)_BINOBJ, \
+    $(addprefix $(BIN_DIR)$(call lc,$(a))/,$($(a)_OBJ)) \
+)))
+
+$(foreach a, $(ALGORITHMS), $(eval $(call Assert_Template, \
+    $(a)_TESTBINOBJ, \
+    $(addprefix $(BIN_DIR)$(call lc,$(a))/$(TEST_DIR),$($(a)_TEST_BIN)) \
+)))
+
+
+#$(foreach a, $(ALGORITHMS), \
+#    $(if $(def $(a)_DIR), \
+#    $(eval $(call Assert_Template, \
+#        $(a)_DIR, \
+#        . \
+#    ) \
+#    )) \
+#)
+#
+#$(foreach a, $(ALGORITHMS), \
+#    $(if $(call seq($(strip($($(a)_DIR))),)), \
+#    $(eval $(call Assert_Template, \
+#        $(a)_DIR, \
+#        . \
+#    ) \
+#    )) \
+#)
+
+#-------------------------------------------------------------------------------
+#
+###	ifeq 'blafoo' ''
+###	    $(error no source ($(2)) for $(1) in TargetSource_Template)
+###	endif
+
+define TargetSource_Template
+$(1): $(2)
+	@echo "[cc]: $(1) <-- $(2)"
+	@mkdir -p $(dir $(1))
+	@$(CC) $(CFLAGS_A) -I./$(strip $(3)) -c -o $(1) $(2)
+endef
 
-PRG        = serpent-test
+$(foreach a, $(ALGORITHMS), \
+  $(foreach b, $($(a)_OBJ), \
+    $(eval $(call TargetSource_Template, \
+      $(BIN_DIR)$(call lc, $(a))/$(b), \
+      $(filter %.S %.c, $(wildcard $($(a)_DIR)$(notdir $(patsubst %.o,%,$(b))).*)), \
+      $($(a)_DIR) \
+    )) \
+  ) \
+)
+
+$(foreach a, $(ALGORITHMS), \
+  $(foreach b, $($(a)_TEST_BIN), \
+    $(eval $(call TargetSource_Template, \
+	  $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)$(b), \
+      $(if $(call sne,$(strip $(filter %.S %.c, $(wildcard $(TESTSRC_DIR)$(notdir $(patsubst %.o,%,$(b))).*))),), \
+          $(filter %.S %.c, $(wildcard $(TESTSRC_DIR)$(notdir $(patsubst %.o,%,$(b))).*)), \
+          $(filter %.S %.c, $(wildcard ./$(notdir $(patsubst %.o,%,$(b))).*))\
+	  ), \
+      $($(a)_DIR) \
+    )) \
+  ) \
+)
+#-------------------------------------------------------------------------------
+
+define MainTestElf_Template
+$(1): $(2) $(3)
+	@echo "[ld]: $(1)"
+	@$(CC) $(CFLAGS_A) $(LDFLAGS)$(patsubst %.elf,%.map,$(1)) -o \
+	$(1) \
+	$(2) $(3) \
+	$(LIBS)
+endef
 
-#SHA1_OBJ		= main-sha1-test.o debug.o uart.o serial-tools.o sha1-asm.o
-#MD5_OBJ		= main-md5-test.o debug.o uart.o serial-tools.o md5.o
+$(foreach a, $(ALGORITHMS), \
+    $(eval $(call MainTestElf_Template,  \
+        $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)main-$(call lc, $(a))-test.elf, \
+        $($(a)_BINOBJ), \
+        $($(a)_TESTBINOBJ) \
+	)) \
+)
 
-#Multi_OBJ		= main.o debug.o uart.o serial-tools.o sha256-asm.o xtea-asm.o arcfour-asm.o prng.o cast5.o
+#-------------------------------------------------------------------------------
 
-#OBJ = $(SERPENT_OBJ)
+all: $(foreach algo, $(ALGORITHMS), $($(algo)_BINOBJ))
 
-DEFS	   =
-LIBS	   =
+#-------------------------------------------------------------------------------
 
-define BLA_TEMPLATE2
-$(2): $(3)
-	echo $$@
-	echo $$^
-	$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
-	$(2) \
-	$(3) \
-	$(LIBS)
+define TestBin_TEMPLATE
+$(1)_TEST_BIN: $(2)
 endef
 
-$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst %.o,%.elf,$(firstword $($(algo)_TEST_BIN))), $($(algo)_TEST_BIN) )))
+$(foreach algo, $(ALGORITHMS), $(eval $(call TestBin_TEMPLATE, \
+    $(algo), \
+    $(BIN_DIR)$(call lc, $(algo))/$(TEST_DIR)main-$(call lc, $(algo))-test.elf \
+)))
 
-.PHONY: info
-info:
-	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)
+#-------------------------------------------------------------------------------
 
-bc:	$(ALGORITHMS_OBJ)
+%.hex: %.elf
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .text -j .data -O ihex $< $@
 
-tests: $(ALGORITHMS_TEST_BIN) \
-       $(ALGORITHMS_TEST_BIN_MAIN_ELF) \
-       $(ALGORITHMS_TEST_BIN_MAIN_HEX)
+#-------------------------------------------------------------------------------
 
+define Flash_Template
+$(1)_FLASH: $(2)
+	@echo "[flash]: $(2)"
+	@$(FLASHCMD)$(call first,$(2))
+endef
 
-$(ALGORITHMS_OBJ):  $(ALGORITHMS_OBJ_IMM)
-$(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
+$(foreach algo, $(ALGORITHMS), $(eval $(call Flash_Template, \
+    $(algo), \
+    $(BIN_DIR)$(call lc, $(algo))/$(TEST_DIR)main-$(call lc, $(algo))-test.hex \
+)))
 
-$(ALGORITHMS):  
-	
-.PHONY: all
-all: $(PRG).elf lst text eeprom
+#-------------------------------------------------------------------------------
 
+define Speed_Template
+$(1)_SPEED:  $(1)_FLASH
+	@$(RUBY) $(SPEEDTOOL) -c $(SPEEDCMD) -t $(SPEEDLOG_DIR) -a $(call lc, $(1))
+endef
 
-.PHONY: clean
-clean:
-	rm -rf *.o *.elf *.eps *.png *.pdf *.bak 
-	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES)
+$(foreach algo, $(ALGORITHMS), $(eval $(call Speed_Template, \
+    $(algo), $(algo) \
+)))
 
-flash:
-	$(ERASECMD)
-	$(FLASHCMD)
-	
-lst:  $(PRG).lst
+.PHONY: hash_speed
+hash_speed: $(foreach algo, $(HASHES), $(algo)_SPEED)
 
-%.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
+#-------------------------------------------------------------------------------
 
-# Rules for building the .text rom images
 
-text: hex bin srec
+define Size_Template
+$(1)_SIZE:  $(2)
+	@echo "[size] $(1)"
+	$(SIZE) $(2) > $(strip $(SIZE_DIR))$(strip $(call lc, $(1))).size
+endef
 
-hex:  $(PRG).hex
-bin:  $(PRG).bin
-srec: $(PRG).srec
+$(foreach algo, $(ALGORITHMS), $(eval $(call Size_Template, \
+    $(strip $(algo)), $($(algo)_BINOBJ) \
+)))
 
-%.hex: %.elf
-	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+.PHONY: hash_size
+hash_size: $(foreach algo, $(HASHES), $(algo)_SIZE)
 
-%.srec: %.elf
-	$(OBJCOPY) -j .text -j .data -O srec $< $@
+#-------------------------------------------------------------------------------
 
-%.bin: %.elf
-	$(OBJCOPY) -j .text -j .data -O binary $< $@
+.PHONY: tests
+tests: $(foreach a, $(ALGORITHMS), $(a)_TEST_BIN)
 
-# Rules for building the .eeprom rom images
+#-------------------------------------------------------------------------------
 
-eeprom: ehex ebin esrec
+define TestRun_Template
+$(1)_TESTRUN: $(1)_FLASH
+	@echo "[test]: $(1)"
+	$(RUBY) $(GET_TEST) $(TESTPORT) $(TESTPORTBAUDR) 8 1 nessie $(TESTLOG_DIR)$(TESTPREFIX) $(2)
+endef
+
+$(foreach algo, $(ALGORITHMS),$(eval $(call TestRun_Template, $(algo), $(call lc,$(algo)) )))
+
+all_testrun: $(foreach algo, $(ALGORITHMS), $(algo)_TESTRUN)
+
+#-------------------------------------------------------------------------------
+
+define Obj_Template
+$(1)_OBJ: $(2)
+endef
+
+$(foreach algo, $(ALGORITHMS), \
+    $(eval $(call Obj_Template, \
+        $(algo), \
+        $($(algo)_BINOBJ)\
+	))\
+)
+
+.PHONY: cores
+cores: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
+
+.PHONY: blockchiphers
+blockciphers: $(foreach algo, $(BLOCK_CIPHERS), $(algo)_OBJ)
 
-ehex:  $(PRG)_eeprom.hex
-ebin:  $(PRG)_eeprom.bin
-esrec: $(PRG)_eeprom.srec
+.PHONY: streamchiphers
+streamciphers: $(foreach algo, $(STREAM_CIPHERS), $(algo)_OBJ)
 
-%_eeprom.hex: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
+.PHONY: hashes
+hashes: $(foreach algo, $(HASHES), $(algo)_OBJ)
 
-%_eeprom.srec: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O srec $< $@
+.PHONY: macs
+macs: $(foreach algo, $(MACS), $(algo)_OBJ)
 
-%_eeprom.bin: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
+.PHONY: prngs
+prngs: $(foreach algo, $(PRNGS), $(algo)_OBJ)
 
-%_size.txt: %.o
-	$(SIZE)  $< > $@
-	
-	
-	
-# Every thing below here is used by avr-libc's build system and can be ignored
-# by the casual user.
+.PHONY: encodings
+encodings: $(foreach algo, $(ENCODINGS), $(algo)_OBJ)
 
-FIG2DEV		 = fig2dev
-EXTRA_CLEAN_FILES       = *.hex *.bin *.srec
+.PHONY: aux
+aux: $(foreach algo, $(AUX), $(algo)_OBJ)
 
-dox: eps png pdf
 
-eps: $(PRG).eps
-png: $(PRG).png
-pdf: $(PRG).pdf
+#-------------------------------------------------------------------------------
+
+
+.PHONY: help
+help: info
+.PHONY: info
+info:
+	@echo "infos on AVR-Crypto-lib:"
+	@echo "  block ciphers:"
+	@echo "    $(BLOCK_CIPHERS)"
+	@echo "  stream ciphers:"
+	@echo "    $(STREAM_CIPHERS)"
+	@echo "  hash functions:"
+	@echo "    $(HASHES)"
+	@echo "  MAC functions:"
+	@echo "    $(MACS)"
+	@echo "  PRNG functions:"
+	@echo "    $(PRNGS)"
+	@echo "  encodings:"
+	@echo "    $(ENCODINGS)"
+	@echo " targets:"
+	@echo "  all           - all algorithm cores"
+	@echo "  cores         - all algorithm cores"
+	@echo "  listings      - all algorithm core listings"
+	@echo "  tests         - all algorithm test programs"
+	@echo "  stats         - all algorithm size statistics"
+	@echo "  blockciphers  - all blockcipher cores"
+	@echo "  streamciphers - all streamcipher cores"
+	@echo "  hashes        - all hash cores"
+	@echo "  macs          - all MAC cores"
+	@echo "  prngs         - all PRNG cores"
+	@echo "  all_testrun   - testrun all algorithms"
+	@echo "  docu          - build doxygen documentation"
+	@echo "  clean         - remove a lot of builded files"
+	@echo "  depclean      - also remove dependency files"
+	@echo "  *_TEST_BIN    - build test program"
+	@echo "  *_TESTRUN     - run nessie test"
+	@echo "  *_OBJ         - build algorithm core"
+	@echo "  *_FLASH       - flash test program"
+	@echo "  *_LIST        - build assembler listing"
+
+
+#-------------------------------------------------------------------------------
+
+.PHONY: clean
+clean:
+	rm -rf $(BIN_DIR)*
+
+.PHONY: depclean
+depclean: clean
+	rm $(DEP_DIR)*.d
 
+#-------------------------------------------------------------------------------
+# dependency inclusion
+#
 
-%.eps: %.fig
-	$(FIG2DEV) -L eps $< $@
+DEPS := $(wildcard $(DEP_DIR)*.d)
 
-%.pdf: %.fig
-	$(FIG2DEV) -L pdf $< $@
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
 
-%.png: %.fig
-	$(FIG2DEV) -L png $< $@