X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=e730a4c00a0d01ec728af75fc3ab5fbf7fb2b1df;hb=d1d3ca64870a4cc4ee0659db7b4387e1dd51549f;hp=6a0e04dc1287bffd72a4f75f40f98de1bfa15688;hpb=6bd58d7909b89a3e05003a63cdc642638fa653e6;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 6a0e04d..e730a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the micro-crypt project
+# Makefile for the AVR-Crypto-Lib project
 # author: Daniel Otte
 
 BLOCK_CIPHERS  := 
@@ -6,23 +6,27 @@ STREAM_CIPHERS :=
 HASHES         :=
 MACS           :=
 PRNGS          := 
+ENCODINGS      :=
 
 # we use the gnu make standard library
 include gmsl
 include avr-makefile.inc
 include mkfiles/*.mk
 
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) $(ENCODINGS)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
+ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
+
 define OBJinBINDIR_TEMPLATE
 $(1) = $(2)
 endef
+
 $(foreach a, $(ALGORITHMS_OBJ), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(BIN_DIR)%.o,$($(a))))))
-ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
+
 $(foreach a, $(ALGORITHMS_TEST_BIN), $(eval $(call OBJinBINDIR_TEMPLATE, $(a), $(patsubst %.o,$(TESTBIN_DIR)%.o,$($(a))))))
 
 
-ALGORITHMS_TEST_BIN_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
+#ALGORITHMS_TEST_BIN_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
 ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
 ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
 
@@ -40,7 +44,7 @@ all: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 
 define MAIN_OBJ_TEMPLATE
 $(2): $(3) $(4)
-	@echo "[ld]: $$@"
+	@echo "[ld] : $$@"
 #	echo $$^
 	@$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
 	$(2) \
@@ -62,7 +66,7 @@ $(foreach algo, $(ALGORITHMS), $(eval $(call MAIN_OBJ_TEMPLATE, \
 help: info
 
 info:
-	@echo "infos on micro-crypt:"
+	@echo "infos on AVR-Crypto-lib:"
 	@echo "  block ciphers:"
 	@echo "    $(BLOCK_CIPHERS)"
 	@echo "  stream ciphers:"
@@ -73,10 +77,32 @@ info:
 	@echo "    $(MACS)"
 	@echo "  PRNG functions:"
 	@echo "    $(PRNGS)"
-#	@echo "  ALGORITHMS_TEST_BIN"
+	@echo "  encodings:"
+	@echo "    $(ENCODINGS)"
+#	@echo "  ALGORITHMS_TEST_BIN:"
 #	@echo "    $(ALGORITHMS_TEST_BIN)"
 #	@echo "  ALGORITHMS_TEST_TARGET_ELF:"
 #	@echo "    $(ALGORITHMS_TEST_TARGET_ELF)"
+	@echo " targets:"
+	@echo "  all           - all algorithm cores"
+	@echo "  cores         - all algorithm cores"
+	@echo "  listings      - all algorithm core listings"
+	@echo "  tests         - all algorithm test programs"
+	@echo "  stats         - all algorithm size statistics"
+	@echo "  blockciphers  - all blockcipher cores"
+	@echo "  streamciphers - all streamcipher cores"
+	@echo "  hashes        - all hash cores"
+	@echo "  macs          - all MAC cores"
+	@echo "  prngs         - all PRNG cores"
+	@echo "  all_testrun   - testrun all algorithms"
+	@echo "  docu          - build doxygen documentation"
+	@echo "  clean         - remove a lot of builded files"
+	@echo "  xclean        - also remove dependency files"
+	@echo "  *_TEST_BIN    - build test program"
+	@echo "  *_TESTRUN     - run nessie test"
+	@echo "  *_OBJ         - build algorithm core"
+	@echo "  *_FLASH       - flash test program"
+	@echo "  *_LIST        - build assembler listing"
 
 #-------------------------------------------------------------------------------
 	
@@ -97,6 +123,15 @@ $(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.S
 	@echo "[as] :  $@"
 	@$(CC) $(ASFLAGS) -c -o $@ $<
 
+$(TESTBIN_DIR)%.o: %.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
+
+$(TESTBIN_DIR)%.o: %.S
+	@echo "[as] :  $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
+
+
 
 %.o: %.c
 	@echo "[gcc]:  $@"
@@ -116,6 +151,15 @@ endef
 
 $(foreach algo, $(ALGORITHMS), $(eval $(call OBJ_TEMPLATE, $(algo), $($(algo)_OBJ))))
 
+
+#-------------------------------------------------------------------------------
+
+define TESTBIN_TEMPLATE
+$(1)_TEST_BIN: $(2)
+endef
+
+$(foreach algo, $(ALGORITHMS), $(eval $(call TESTBIN_TEMPLATE, $(algo), $($(algo)_TEST_BIN))))
+
 #-------------------------------------------------------------------------------
 
 $(BLOCK_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(BLOCK_CIPHERS)) 
@@ -123,8 +167,7 @@ $(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)
+$(ENCODINGS_OBJ): $(patsubst %,%_OBJ, $(ENCODINGS))
 
 #-------------------------------------------------------------------------------
 
@@ -151,12 +194,12 @@ $(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), $(TESTBIN_D
 define TESTRUN_TEMPLATE
 $(1)_TESTRUN: $(1)_FLASH
 	@echo "[test]: $(1)"
-	$(RUBY) get_test.rb  $(TESTPORT) $(TESTPORTBAUDR) 8 1 nessie $(TESTLOG_DIR)$(TESTPREFIX) $(2)
+	$(RUBY) $(GET_TEST)  $(TESTPORT) $(TESTPORTBAUDR) 8 1 nessie $(TESTLOG_DIR)$(TESTPREFIX) $(2)
 endef
 
 $(foreach algo, $(ALGORITHMS),$(eval $(call TESTRUN_TEMPLATE, $(algo), $(call lc,$(algo)) )))
 
-ALL_TESTRUN: $(foreach algo, $(ALGORITHMS), $(algo)_TESTRUN)
+all_testrun: $(foreach algo, $(ALGORITHMS), $(algo)_TESTRUN)
 
 #-------------------------------------------------------------------------------
 
@@ -164,7 +207,11 @@ define LISTING_TEMPLATE
 $(1)_LIST: $(2)
 endef
 
-$(foreach algo, $(ALGORITHMS),$(eval $(call LISTING_TEMPLATE,$(call uc, $(algo)), $(patsubst %.o,%.lst,$(algo)_OBJ) )))
+$(foreach algo, $(ALGORITHMS),$(eval $(call LISTING_TEMPLATE,$(call uc, $(algo)), \
+ $(patsubst %,$(LIST_DIR)%, \
+  $(patsubst $(BIN_DIR)%,%, \
+  $(patsubst $(TESTBIN_DIR)%,%, \
+  $(patsubst %.o,%.lst,$($(algo)_OBJ)))) ))))
 
 listings: $(patsubst %,%_LIST,$(ALGORITHMS))
 
@@ -198,6 +245,9 @@ macs: $(patsubst %, %_OBJ, $(MACS))
 .PHONY:  prngs
 prngs: $(patsubst %, %_OBJ, $(PRNGS))
 
+.PHONY:  encodings
+encodings: $(patsubst %, %_OBJ, $(ENCODINGS))
+
 tests: $(ALGORITHMS_TEST_BIN) \
        $(ALGORITHMS_TEST_TARGET_ELF) \
        $(ALGORITHMS_TEST_TARGET_HEX)
@@ -222,6 +272,20 @@ xclean: clean
 docu:
 	doxygen
 
+make.dump: Makefile
+	$(MAKE) -p -B -n -f $^ > $@
+
+make.dot: make.dump
+	$(MAKE2GRAPH) $^ > $@
+
+make.png: make.dot
+	$(TWOPI) -Tpng -o $@ $^
+
+make.svg: make.dot
+	$(TWOPI) -Tsvg -o $@ $^
+
+.PHONY: make-info
+make-info: make.png make.svg
 
 
 # Rules for building the .text rom images