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

diff --git a/Makefile b/Makefile
index fc63924..79b3338 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
 # Makefile for the micro-crypt project
 # author: Daniel Otte
 
-BLOCK_CIPHERS  = 
-STREAM_CIPHERS = 
-HASHES         = 
-
-
+BLOCK_CIPHERS  := 
+STREAM_CIPHERS := 
+HASHES         :=
+MACS           :=
+PRNGS          := 
+
+# we use the gnu make standard library
+include gmsl
 include avr-makefile.inc
 include *.mk
 
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES)
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
 ALGORITHMS_OBJ_IMM = $(foreach a, $(ALGORITHMS_OBJ), $($(a)))
 ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
@@ -21,24 +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))
 
-
-PRG        = serpent-test
-
-#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
-
-#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)
+#ALGORITHMS_LC = #algorithm names in lowercase 
+#ALGORITHMS_LC = $(foreach a, $(ALGORITHMS), $$(lc Text))
+ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
+PRG = remove_me
 
 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)
@@ -48,27 +46,89 @@ $(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst
 
 .PHONY: info
 info:
-	echo $(ALGORITHMS_TEST_BIN_MAIN)
-	echo $(ALGORITHMS)
-	echo $(firstword $(XTEA_TEST_BIN))
-	echo $(patsubst %.o,%.elf,$(firstword $(XTEA_TEST_BIN)))
+	@echo "infos on micro-crypt:"
+	@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 "  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)
 
-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
@@ -122,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)  $< > $@