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

diff --git a/Makefile b/Makefile
index e725133..6a0e04d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,8 @@ $(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,$(BIN_DIR)%.o,$($(a))))))
-ALGORITHMS_TEST_BIN_MAIN = $(foreach a, $(ALGORITHMS_TEST_BIN), $(firstword $($(a))))
-ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.elf, $(ALGORITHMS_TEST_BIN_MAIN))
-ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst $(BIN_DIR)%.o, $(TESTBIN_DIR)%.hex, $(ALGORITHMS_TEST_BIN_MAIN))
+$(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_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
@@ -30,6 +28,9 @@ ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
 
 ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
 
+ALGORITHMS_TEST_TARGET_ELF = $(patsubst %, $(TESTBIN_DIR)main-%-test.elf, $(ALGORITHMS_LC))
+ALGORITHMS_TEST_TARGET_HEX = $(patsubst %, $(TESTBIN_DIR)main-%-test.hex, $(ALGORITHMS_LC))
+
 
 #-------------------------------------------------------------------------------
 
@@ -37,21 +38,29 @@ all: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 
 #-------------------------------------------------------------------------------
 
-define BLA_TEMPLATE2
-$(2): $(3)
-	@echo "[gcc]: $$@"
+define MAIN_OBJ_TEMPLATE
+$(2): $(3) $(4)
+	@echo "[ld]: $$@"
 #	echo $$^
 	@$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
 	$(2) \
-	$(3) \
+	$(3) $(4) \
 	$(LIBS)
 endef
 
-$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst $(BIN_DIR)%.o,$(TESTBIN_DIR)%.elf,$(firstword $($(algo)_TEST_BIN))), $(patsubst %.o,%.o,$($(algo)_TEST_BIN)) )))
+$(foreach algo, $(ALGORITHMS), $(eval $(call MAIN_OBJ_TEMPLATE, \
+   $(algo), \
+   $(TESTBIN_DIR)main-$(call lc,$(algo))-test.elf, \
+   $(patsubst %.o,%.o,$($(algo)_TEST_BIN)), \
+   $(patsubst %.o,%.o,$($(algo)_OBJ))  )))
+
+
+
 
 #-------------------------------------------------------------------------------
+.PHONY: help
+help: info
 
-.PHONY: info
 info:
 	@echo "infos on micro-crypt:"
 	@echo "  block ciphers:"
@@ -64,6 +73,13 @@ 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)"
+
+#-------------------------------------------------------------------------------
+	
 
 $(BIN_DIR)%.o: %.c
 	@echo "[gcc]:  $@"
@@ -73,45 +89,24 @@ $(BIN_DIR)%.o: %.S
 	@echo "[as] :  $@"
 	@$(CC) $(ASFLAGS) -c -o $@ $<
 
-%.o: %.c
+$(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.c
 	@echo "[gcc]:  $@"
 	@$(CC) $(CFLAGS)  -c -o $@ $<
 
-%.o: %.S
+$(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))
+%.o: %.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
 
-tests: $(ALGORITHMS_TEST_BIN) \
-       $(ALGORITHMS_TEST_BIN_MAIN_ELF) \
-       $(ALGORITHMS_TEST_BIN_MAIN_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)
@@ -139,7 +134,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))))
 
 #-------------------------------------------------------------------------------
 
@@ -149,47 +144,114 @@ $(1)_FLASH: $(2)
 	@$(FLASHCMD)$(call first,$(2))
 endef
 
-$(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), \
-                $(patsubst %.o,%.hex,$(firstword $($(algo)_TEST_BIN)))) ))  
+$(foreach algo, $(ALGORITHMS),$(eval $(call FLASH_TEMPLATE, $(algo), $(TESTBIN_DIR)main-$(call lc,$(algo))-test.hex) ))  
+
+#-------------------------------------------------------------------------------
+
+define TESTRUN_TEMPLATE
+$(1)_TESTRUN: $(1)_FLASH
+	@echo "[test]: $(1)"
+	$(RUBY) get_test.rb  $(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)
+
+#-------------------------------------------------------------------------------
+
+define LISTING_TEMPLATE
+$(1)_LIST: $(2)
+endef
+
+$(foreach algo, $(ALGORITHMS),$(eval $(call LISTING_TEMPLATE,$(call uc, $(algo)), $(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
 
-flash:
-	$(ERASECMD)
-	$(FLASHCMD)
+docu:
+	doxygen
+
 
-%.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
 
 # Rules for building the .text rom images
 
 %.hex: %.elf
-	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .text -j .data -O ihex $< $@
 
 %.srec: %.elf
-	$(OBJCOPY) -j .text -j .data -O srec $< $@
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .text -j .data -O srec $< $@
 
 %.bin: %.elf
-	$(OBJCOPY) -j .text -j .data -O binary $< $@
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .text -j .data -O binary $< $@
 
 # Rules for building the .eeprom rom images
 
 
 %_eeprom.hex: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O ihex $< $@
 
 %_eeprom.srec: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O srec $< $@
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O srec $< $@
 
 %_eeprom.bin: %.elf
-	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
+	@echo "[objcopy]: $@"
+	@$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
 	
 	
 # Every thing below here is used by avr-libc's build system and can be ignored