From c26c0ae7602db9d3b2d7baf6ae6fc9639539ad02 Mon Sep 17 00:00:00 2001 From: bg Date: Tue, 30 Dec 2014 14:09:38 +0100 Subject: [PATCH] adjusting make-system for AEAD-Ciphers --- Makefile_main.inc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile_main.inc b/Makefile_main.inc index 34aa625..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,12 +69,21 @@ 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 @@ -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:" -- 2.39.5