X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=79b333821d710e5e3df741132fa26a2b90dac29c;hb=9e7453525f32441ea49ef1d9b3248e94d9554eec;hp=5993599593ee84ef208eef8ab6a724d8fcb391c5;hpb=8537c7a0647b533f078af9c35bce533335c7556e;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 5993599..79b3338 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,20 +24,19 @@ 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 = #algorithm names in lowercase 
+#ALGORITHMS_LC = $(foreach a, $(ALGORITHMS), $$(lc Text))
+ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
 PRG = remove_me
 
-#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)
-
 DEFS	   =
 LIBS	   =
 
 define BLA_TEMPLATE2
 $(2): $(3)
-	echo $$@
-	echo $$^
-	$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
+	@echo "[gcc]: $$@"
+#	echo $$^
+	@$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
 	$(2) \
 	$(3) \
 	$(LIBS)
@@ -57,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))
@@ -67,17 +70,65 @@ info:
 #	echo $(ALGORITHMS_NESSIE_TEST)
 #	echo $(ALGORITHMS_PERFORMANCE_TEST)
 
-bc:	$(ALGORITHMS_OBJ)
+%.o: %.c
+	@echo "[gcc]: $@"
+	@$(CC) $(CFLAGS) -c	-o $@ $<
+
+%.o: %.S
+	@echo "[as] : $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
+
+
+.PHONY: cores
+cores: $(ALGORITHMS_OBJ)
+
+.PHONY: blockciphers
+blockciphers: $(patsubst %, %_OBJ, $(BLOCK_CIPHERS))
+
+.PHONY: streamciphers
+streamciphers: $(patsubst %, %_OBJ, $(STREAM_CIPHERS))
+
+.PHONY:  hashes
+hashes: $(patsubst %, %_OBJ, $(HASHES))
+
+.PHONY:  macs
+macs: $(patsubst %, %_OBJ, $(MACS))
+
+prngs: $(patsubst %, %_OBJ, $(PRNGS))
 
 tests: $(ALGORITHMS_TEST_BIN) \
        $(ALGORITHMS_TEST_BIN_MAIN_ELF) \
        $(ALGORITHMS_TEST_BIN_MAIN_HEX)
 
 
-$(ALGORITHMS_OBJ):  $(ALGORITHMS_OBJ_IMM)
+define OBJ_TEMPLATE
+$(1)_OBJ: $(2)
+#	@echo " ALGO: $(1)"
+#	@echo " REQ:  $(2)"
+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))
+$(HASHES_OBJ): $(patsubst %,%_OBJ, $(HASHES))
+$(PRNGS_OBJ): $(patsubst %,%_OBJ, $(PRNGS))
+$(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
+
 $(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
 
-#$(ALGORITHMS):  
+
+define SIZE_TEMPLATE
+$(1)_size.txt: $(2)
+	@echo " ALGO: $(1)"
+	@echo " REQ:  $(2)"
+	$(SIZE) $(2) > $(1)_size.txt
+endef
+
+$(foreach algo, $(ALGORITHMS), $(eval $(call SIZE_TEMPLATE, $(call lc,$(algo)), $($(algo)_OBJ))))
+
+
 	
 .PHONY: all
 all: $(PRG).elf lst text eeprom
@@ -131,8 +182,8 @@ esrec: $(PRG)_eeprom.srec
 %_eeprom.bin: %.elf
 	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
 
-%_size.txt: %.o
-	$(SIZE)  $< > $@
+#%_size.txt: %.o
+#	$(SIZE)  $< > $@