X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=inline;f=Makefile;h=c5460d793f6d68af80e948a679cf151a4da50bb7;hb=cdcf3abb345577e07bdce0623c947e2737b84085;hp=169eb668bfac7dbed48e70aeebdfaa4b82c906b6;hpb=d4b9cfc34ce9f08df95df2933627e4e04337d36d;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 169eb66..c5460d7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ HASHES         :=
 MACS           :=
 PRNGS          := 
 
-
+# we use the gnu make standard library
+include gmsl
 include avr-makefile.inc
 include *.mk
 
@@ -23,10 +24,11 @@ ALGORITHMS_TEST_BIN_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
 ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
 ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
 
+ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
+
 PRG = remove_me
 
-DEFS	   =
-LIBS	   =
+#-------------------------------------------------------------------------------
 
 define BLA_TEMPLATE2
 $(2): $(3)
@@ -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,6 +57,9 @@ 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))
@@ -64,11 +71,11 @@ info:
 #	echo $(ALGORITHMS_PERFORMANCE_TEST)
 
 %.o: %.c
-	@echo "[gcc]: $@"
+	@echo "[gcc]:  $@"
 	@$(CC) $(CFLAGS) -c	-o $@ $<
 
 %.o: %.S
-	@echo "[as] : $@"
+	@echo "[as] :  $@"
 	@$(CC) $(ASFLAGS) -c -o $@ $<
 
 
@@ -87,13 +94,23 @@ hashes: $(patsubst %, %_OBJ, $(HASHES))
 .PHONY:  macs
 macs: $(patsubst %, %_OBJ, $(MACS))
 
+.PHONY:  prngs
 prngs: $(patsubst %, %_OBJ, $(PRNGS))
 
 tests: $(ALGORITHMS_TEST_BIN) \
        $(ALGORITHMS_TEST_BIN_MAIN_ELF) \
        $(ALGORITHMS_TEST_BIN_MAIN_HEX)
 
-
+.PHONY:  stats
+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)
 #	@echo " ALGO: $(1)"
@@ -102,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))
@@ -110,15 +128,39 @@ $(PRNGS_OBJ): $(patsubst %,%_OBJ, $(PRNGS))
 $(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
 
 $(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
+
+#-------------------------------------------------------------------------------
+
+define SIZE_TEMPLATE
+$(1)_size.txt: $(2)
+	@echo "[size]: $(1)_size.txt"
+	@$(SIZE) $(2) > $(1)_size.txt
+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 
-	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES)
+	rm -rf *.o *.elf *.eps *.png *.pdf *.bak *_size.txt
+	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
 
 flash:
 	$(ERASECMD)
@@ -162,10 +204,6 @@ esrec: $(PRG)_eeprom.srec
 
 %_eeprom.bin: %.elf
 	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
-
-%_size.txt: %.o
-	$(SIZE)  $< > $@
-	
 	
 	
 # Every thing below here is used by avr-libc's build system and can be ignored