adjusting make-system for AEAD-Ciphers

This commit is contained in:
bg nerilex 2014-12-30 14:09:38 +01:00
parent f63427e84c
commit c26c0ae760
1 changed files with 14 additions and 2 deletions

View File

@ -18,6 +18,7 @@
BLOCK_CIPHERS := BLOCK_CIPHERS :=
STREAM_CIPHERS := STREAM_CIPHERS :=
AEAD_CIPHERS :=
HASHES := HASHES :=
MACS := MACS :=
PRNGS := PRNGS :=
@ -39,8 +40,8 @@ include $(sort $(wildcard mkfiles/*.mk))
default: info default: info
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) \ ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(AEAD_CIPHERS) $(HASHES) \
$(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX) $(PRNGS) $(MACS) $(ENCODINGS) $(SIGNATURE) $(PK_CIPHERS) $(AUX)
ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS)) ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
ALGORITHMS_TESTBIN = $(patsubst %,%_TESTBIN, $(ALGORITHMS)) ALGORITHMS_TESTBIN = $(patsubst %,%_TESTBIN, $(ALGORITHMS))
@ -68,12 +69,21 @@ define GenericTarget_Template
$(1): $(2) $(1): $(2)
endef endef
ifeq ($(V),)
define TargetSource_Template define TargetSource_Template
$(1): $(2) $(1): $(2)
@mkdir -p $(dir $(1)) $(DEP_DIR) @mkdir -p $(dir $(1)) $(DEP_DIR)
@echo "[cc]: $(1) <-- $(2)" @echo "[cc]: $(1) <-- $(2)"
@$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2) @$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2)
endef 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 " $(BLOCK_CIPHERS)"
@echo " stream ciphers:" @echo " stream ciphers:"
@echo " $(STREAM_CIPHERS)" @echo " $(STREAM_CIPHERS)"
@echo " AEAD ciphers:"
@echo " $(AEAD_CIPHERS)"
@echo " hash functions:" @echo " hash functions:"
@echo " $(HASHES)" @echo " $(HASHES)"
@echo " MAC functions:" @echo " MAC functions:"