X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=359e592f636474b632aa4e0ffd111e359c5ab988;hb=e363148c4ed1265a963d310102ce5dd7c9e1e326;hp=06b4475ce5af2087ca46fe5092e43152c866c046;hpb=8d79feec50a05a02fadb12e516c20674e698d5ae;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 06b4475..359e592 100644
--- a/Makefile
+++ b/Makefile
@@ -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))
 
@@ -73,10 +76,12 @@ 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)"
+
+#-------------------------------------------------------------------------------
 	
 
 $(BIN_DIR)%.o: %.c
@@ -104,37 +109,7 @@ $(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.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))
-
-tests: $(ALGORITHMS_TEST_BIN) \
-       $(ALGORITHMS_TEST_TARGET_ELF) \
-       $(ALGORITHMS_TEST_TARGET_HEX)
-
-.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 +119,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 +136,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 +144,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))))
 
 #-------------------------------------------------------------------------------
 
@@ -188,12 +170,66 @@ 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
 
@@ -201,8 +237,6 @@ docu:
 	doxygen
 
 
-%.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
 
 # Rules for building the .text rom images