X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=09457bec100e72b4547c7a8b9fa95e8e7f118c80;hb=96ebafd201c9e8441c7677577b24aa402c1defc6;hp=153b7f354281223f9a0aa525abfd12bae5622087;hpb=2aee09dcaf731b4086e7cdb865ee77b2715ce751;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 153b7f3..09457be 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
 
 PRG = remove_me
 
+#-------------------------------------------------------------------------------
+
 define BLA_TEMPLATE2
 $(2): $(3)
 	@echo "[gcc]: $$@"
@@ -40,6 +42,8 @@ endef
 
 $(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst %.o,%.elf,$(firstword $($(algo)_TEST_BIN))), $($(algo)_TEST_BIN) )))
 
+#-------------------------------------------------------------------------------
+
 .PHONY: info
 info:
 	@echo "infos on micro-crypt:"
@@ -53,8 +57,8 @@ info:
 	@echo "    $(MACS)"
 	@echo "  PRNG functions:"
 	@echo "    $(PRNGS)"
-	@echo "  LC functions:"
-	@echo "    $(ALGORITHMS_LC)"
+#	@echo "  LC functions:"
+#	@echo "    $(ALGORITHMS_LC)"
 	
 #	echo $(ALGORITHMS_TEST_BIN_MAIN)
 #	echo $(ALGORITHMS)
@@ -98,8 +102,14 @@ tests: $(ALGORITHMS_TEST_BIN) \
        $(ALGORITHMS_TEST_BIN_MAIN_HEX)
 
 .PHONY:  stats
-stats: $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
-	$(RUBY) sumsize.rb $^ > sizestats.txt
+stats: $(SIZESTAT_FILE)
+#$(patsubst %, %_size.txt, $(ALGORITHMS_LC))
+	
+	
+$(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
+	$(RUBY) sumsize.rb $^ > $(SIZESTAT_FILE)
+	@cat $(SIZESTAT_FILE)	
+#-------------------------------------------------------------------------------	
 	
 define OBJ_TEMPLATE
 $(1)_OBJ: $(2)
@@ -109,6 +119,7 @@ endef
 
 $(foreach algo, $(ALGORITHMS), $(eval $(call OBJ_TEMPLATE, $(algo), $($(algo)_OBJ))))
 
+#-------------------------------------------------------------------------------
 
 $(BLOCK_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(BLOCK_CIPHERS)) 
 $(STREAM_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(STREAM_CIPHERS))
@@ -118,6 +129,7 @@ $(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
 
 $(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
 
+#-------------------------------------------------------------------------------
 
 define SIZE_TEMPLATE
 $(1)_size.txt: $(2)
@@ -127,16 +139,30 @@ endef
 
 $(foreach algo, $(ALGORITHMS), $(eval $(call SIZE_TEMPLATE, $(call lc,$(algo)), $($(algo)_OBJ))))
 
+#-------------------------------------------------------------------------------
+
+define FLASH_TEMPLATE
+$(1)_FLASH: $(2)
+	@echo "[flash]: $(2)"
+	@$(FLASHCMD)$(call first,$(2))
+endef
+
+$(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), \
+                $(patsubst %.o,%.hex,$(firstword $($(algo)_TEST_BIN)))) ))  
 
+#-------------------------------------------------------------------------------
 	
 .PHONY: all
-all: $(PRG).elf lst text eeprom
+all: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
+#all: $(PRG).elf lst text eeprom
 
 
 .PHONY: clean
 clean:
 	rm -rf *.o *.elf *.eps *.png *.pdf *.bak *_size.txt
-	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES)
+	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
+xclean: clean
+	rm -rf *.d
 
 flash:
 	$(ERASECMD)
@@ -203,3 +229,10 @@ pdf: $(PRG).pdf
 
 %.png: %.fig
 	$(FIG2DEV) -L png $< $@
+
+
+DEPS := $(wildcard *.d)
+ifneq ($(DEPS),)
+include $(DEPS)
+endif
+