X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=Makefile_main.inc;h=a2e478641d5d57573b06804f66f4f84d326f15ee;hp=f448e8dacc81ee59ae7efd426ab07d51dd0a8ef9;hb=d72d6fbe7abbd26958657c877bc0a3dbef8148ce;hpb=d61b874c6e685cfc0de6c67bbb2db47442cdae8e diff --git a/Makefile_main.inc b/Makefile_main.inc index f448e8d..a2e4786 100644 --- a/Makefile_main.inc +++ b/Makefile_main.inc @@ -18,6 +18,7 @@ BLOCK_CIPHERS := STREAM_CIPHERS := +AEAD_CIPHERS := HASHES := MACS := PRNGS := @@ -39,8 +40,8 @@ include $(sort $(wildcard mkfiles/*.mk)) default: info #------------------------------------------------------------------------------- -ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) \ - $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX) +ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(AEAD_CIPHERS) $(HASHES) \ + $(PRNGS) $(MACS) $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX) ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS)) ALGORITHMS_TESTBIN = $(patsubst %,%_TESTBIN, $(ALGORITHMS)) @@ -68,19 +69,28 @@ define GenericTarget_Template $(1): $(2) endef +ifeq ($(V),) define TargetSource_Template $(1): $(2) @mkdir -p $(dir $(1)) $(DEP_DIR) @echo "[cc]: $(1) <-- $(2)" @$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2) endef +else +define TargetSource_Template +$(1): $(2) + @mkdir -p $(dir $(1)) $(DEP_DIR) + @echo "[cc]: $(1) <-- $(2)" + $(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2) +endef +endif define TargetSourceList_Template $(1): $(2) @mkdir -p $(dir $(1)) $(DEP_DIR) - @echo "[cc]: $(1) <-- $(2)" + @echo "[lst]: $(1) <-- $(2)" @$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) $(LIST_OPT) -c -o /dev/null $(2) > $(1) endef @@ -213,7 +223,7 @@ $(foreach algo, $(ALGORITHMS), $(eval $(call Listing_TEMPLATE, \ ifdef HASH_TOOL ifneq ($(HASH_TOOL),) @echo -n "[$(HASH_TOOL)]: " - @$(HASH_TOOL) $< + @$(HASH_TOOL) $@ endif endif @@ -361,6 +371,8 @@ info: @echo " $(BLOCK_CIPHERS)" @echo " stream ciphers:" @echo " $(STREAM_CIPHERS)" + @echo " AEAD ciphers:" + @echo " $(AEAD_CIPHERS)" @echo " hash functions:" @echo " $(HASHES)" @echo " MAC functions:"