X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=c4899a244c8d5033260a743c85cdf10f24e94fe5;hb=e5a49deb52521f019e37779d6e9d81ec4f02aba4;hp=c06b398b758b64107bd5874df88cdc13e9edc555;hpb=b07fb998ba047b641edb843e73f5284fe5fff9af;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index c06b398..c4899a2 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  := 
@@ -14,15 +14,18 @@ include mkfiles/*.mk
 
 ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
 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 +43,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 +65,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 +76,32 @@ info:
 	@echo "    $(MACS)"
 	@echo "  PRNG functions:"
 	@echo "    $(PRNGS)"
-	@echo "  ALGORITHMS_TEST_BIN"
-	@echo "    $(ALGORITHMS_TEST_BIN)"
-	@echo "  ALGORITHMS_TEST_TARGET_ELF:"
-	@echo "    $(ALGORITHMS_TEST_TARGET_ELF)"
+#	@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"
+
+#-------------------------------------------------------------------------------
 	
 
 $(BIN_DIR)%.o: %.c
@@ -95,46 +120,25 @@ $(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.S
 	@echo "[as] :  $@"
 	@$(CC) $(ASFLAGS) -c -o $@ $<
 
-
-%.o: %.c
+$(TESTBIN_DIR)%.o: %.c
 	@echo "[gcc]:  $@"
 	@$(CC) $(CFLAGS)  -c -o $@ $<
 
-%.o: %.S
+$(TESTBIN_DIR)%.o: %.S
 	@echo "[as] :  $@"
 	@$(CC) $(ASFLAGS) -c -o $@ $<
 
 
-.PHONY: cores
-cores: $(ALGORITHMS_OBJ)
-
-.PHONY: blockciphers
-blockciphers: $(patsubst %, %_OBJ, $(BLOCK_CIPHERS))
-
-.PHONY: streamciphers
-streamciphers: $(patsubst %, %_OBJ, $(STREAM_CIPHERS))
-
-.PHONY:  hashes
-hashes: $(patsubst %, %_OBJ, $(HASHES))
-
-.PHONY:  macs
-macs: $(patsubst %, %_OBJ, $(MACS))
 
-.PHONY:  prngs
-prngs: $(patsubst %, %_OBJ, $(PRNGS))
+%.o: %.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
 
-tests: $(ALGORITHMS_TEST_BIN) \
-       $(ALGORITHMS_TEST_TARGET_ELF) \
-       $(ALGORITHMS_TEST_TARGET_HEX)
+%.o: %.S
+	@echo "[as] :  $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
 
-.PHONY:  stats
-stats: $(SIZESTAT_FILE)
-	
-	
-$(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
-	$(RUBY) sumsize.rb $^ > $(SIZESTAT_FILE)
-	@cat $(SIZESTAT_FILE)	
-#-------------------------------------------------------------------------------	
+#-------------------------------------------------------------------------------
 	
 define OBJ_TEMPLATE
 $(1)_OBJ: $(2)
@@ -144,6 +148,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)) 
@@ -152,8 +165,6 @@ $(HASHES_OBJ): $(patsubst %,%_OBJ, $(HASHES))
 $(PRNGS_OBJ): $(patsubst %,%_OBJ, $(PRNGS))
 $(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
 
-$(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
-
 #-------------------------------------------------------------------------------
 
 define SIZE_TEMPLATE
@@ -162,7 +173,7 @@ $(1)_size.txt: $(2)
 	@$(SIZE) $(2) > $(1)_size.txt
 endef
 
-$(foreach algo, $(ALGORITHMS), $(eval $(call SIZE_TEMPLATE, $(call lc,$(algo)), $($(algo)_OBJ))))
+$(foreach algo, $(ALGORITHMS), $(eval $(call SIZE_TEMPLATE, $(STAT_DIR)$(call lc,$(algo)), $($(algo)_OBJ))))
 
 #-------------------------------------------------------------------------------
 
@@ -179,33 +190,96 @@ $(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)
 
 #-------------------------------------------------------------------------------
 
+define LISTING_TEMPLATE
+$(1)_LIST: $(2)
+endef
+
+$(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))
+
+
+$(LIST_DIR)%.lst: $(TESTBIN_DIR)%.elf
+	$(OBJDUMP) -h -S $< > $@
+
+$(LIST_DIR)%.lst: $(BIN_DIR)%.o
+	$(OBJDUMP) -h -S $< > $@
+
+$(LIST_DIR)%.lst: $(TESTBIN_DIR)%.o
+	$(OBJDUMP) -h -S $< > $@
+
+#-------------------------------------------------------------------------------
+
+.PHONY: cores
+cores: $(ALGORITHMS_OBJ)
+
+.PHONY: blockciphers
+blockciphers: $(patsubst %, %_OBJ, $(BLOCK_CIPHERS))
+
+.PHONY: streamciphers
+streamciphers: $(patsubst %, %_OBJ, $(STREAM_CIPHERS))
+
+.PHONY:  hashes
+hashes: $(patsubst %, %_OBJ, $(HASHES))
+
+.PHONY:  macs
+macs: $(patsubst %, %_OBJ, $(MACS))
+
+.PHONY:  prngs
+prngs: $(patsubst %, %_OBJ, $(PRNGS))
+
+tests: $(ALGORITHMS_TEST_BIN) \
+       $(ALGORITHMS_TEST_TARGET_ELF) \
+       $(ALGORITHMS_TEST_TARGET_HEX)
+
+.PHONY:  stats
+stats: $(SIZESTAT_FILE)
+	@cat $(STAT_DIR)$(SIZESTAT_FILE)	
+	
+$(SIZESTAT_FILE): $(patsubst %, $(STAT_DIR)%_size.txt, $(ALGORITHMS_LC))
+	$(RUBY) sumsize.rb $^ > $(STAT_DIR)$(SIZESTAT_FILE)
+	
+#-------------------------------------------------------------------------------	
 
 
 .PHONY: clean
 clean:
-	rm -rf $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak *_size.txt
-	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(SIZESTAT_FILE)
+	rm -rf $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak
+	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES) $(STAT_DIR)$(SIZESTAT_FILE) $(STAT_DIR)*_size.txt
 xclean: clean
 	rm -rf $(DEP_DIR)*.d
 
 docu:
 	doxygen
 
+make.dump: Makefile
+	$(MAKE) -p -B -n -f $^ > $@
 
-%.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
+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
 
-%.lst: %.o
-	$(OBJDUMP) -h -S $< > $@
 
 # Rules for building the .text rom images