switching uart header file

[avr-crypto-lib.git] / Makefile_main.inc

diff --git a/Makefile_main.inc b/Makefile_main.inc
index f448e8dacc81ee59ae7efd426ab07d51dd0a8ef9..7402b9d91ef90eca41c8086600a8a02e33650d67 100644 (file)
--- a/Makefile_main.inc
+++ b/Makefile_main.inc
@@ -1,7 +1,7 @@
 # Makefile for the AVR-Crypto-Lib project
 #
 #    This file is part of the AVR-Crypto-Lib.
-#    Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
+#    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -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:"