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

diff --git a/Makefile b/Makefile
index c8a52b7..06b4475 100644
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,17 @@ PRNGS          :=
 # we use the gnu make standard library
 include gmsl
 include avr-makefile.inc
-include *.mk
+include mkfiles/*.mk
 
 ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
-ALGORITHMS_OBJ_IMM = $(foreach a, $(ALGORITHMS_OBJ), $($(a)))
+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))
-ALGORITHMS_TEST_BIN_MAIN = $(foreach a, $(ALGORITHMS_TEST_BIN), $(firstword $($(a))))
-ALGORITHMS_TEST_BIN_MAIN_ELF = $(patsubst %.o, %.elf, $(ALGORITHMS_TEST_BIN_MAIN))
-ALGORITHMS_TEST_BIN_MAIN_HEX = $(patsubst %.o, %.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))
@@ -26,7 +28,9 @@ ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
 
 ALGORITHMS_LC = $(call lc,$(ALGORITHMS))
 
-PRG = remove_me
+ALGORITHMS_TEST_TARGET_ELF = $(patsubst %, $(TESTBIN_DIR)main-%-test.elf, $(ALGORITHMS_LC))
+ALGORITHMS_TEST_TARGET_HEX = $(patsubst %, $(TESTBIN_DIR)main-%-test.hex, $(ALGORITHMS_LC))
+
 
 #-------------------------------------------------------------------------------
 
@@ -34,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 %.o,%.elf,$(firstword $($(algo)_TEST_BIN))), $($(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:"
@@ -61,22 +73,32 @@ info:
 	@echo "    $(MACS)"
 	@echo "  PRNG functions:"
 	@echo "    $(PRNGS)"
-#	@echo "  LC functions:"
-#	@echo "    $(ALGORITHMS_LC)"
+	@echo "  ALGORITHMS_TEST_BIN"
+	@echo "    $(ALGORITHMS_TEST_BIN)"
+	@echo "  ALGORITHMS_TEST_TARGET_ELF:"
+	@echo "    $(ALGORITHMS_TEST_TARGET_ELF)"
 	
-#	echo $(ALGORITHMS_TEST_BIN_MAIN)
-#	echo $(ALGORITHMS)
-#	echo $(firstword $(XTEA_TEST_BIN))
-#	echo $(patsubst %.o,%.elf,$(firstword $(XTEA_TEST_BIN)))
-#	echo $(ALGORITHMS_OBJ)
-#	echo $(ALGORITHMS_OBJ_IMM)
-#	echo $(ALGORITHMS_TEST_BIN)
-#	echo $(ALGORITHMS_NESSIE_TEST)
-#	echo $(ALGORITHMS_PERFORMANCE_TEST)
+
+$(BIN_DIR)%.o: %.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
+
+$(BIN_DIR)%.o: %.S
+	@echo "[as] :  $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
+
+$(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
+
+$(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.S
+	@echo "[as] :  $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
+
 
 %.o: %.c
 	@echo "[gcc]:  $@"
-	@$(CC) $(CFLAGS) -c	-o $@ $<
+	@$(CC) $(CFLAGS)  -c -o $@ $<
 
 %.o: %.S
 	@echo "[as] :  $@"
@@ -102,12 +124,11 @@ macs: $(patsubst %, %_OBJ, $(MACS))
 prngs: $(patsubst %, %_OBJ, $(PRNGS))
 
 tests: $(ALGORITHMS_TEST_BIN) \
-       $(ALGORITHMS_TEST_BIN_MAIN_ELF) \
-       $(ALGORITHMS_TEST_BIN_MAIN_HEX)
+       $(ALGORITHMS_TEST_TARGET_ELF) \
+       $(ALGORITHMS_TEST_TARGET_HEX)
 
 .PHONY:  stats
 stats: $(SIZESTAT_FILE)
-#$(patsubst %, %_size.txt, $(ALGORITHMS_LC))
 	
 	
 $(SIZESTAT_FILE): $(patsubst %, %_size.txt, $(ALGORITHMS_LC))
@@ -151,60 +172,66 @@ $(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)
+
+#-------------------------------------------------------------------------------
+
+
+
 .PHONY: clean
 clean:
-	rm -rf *.o *.elf *.eps *.png *.pdf *.bak *_size.txt
+	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)
 xclean: clean
-	rm -rf *.d
+	rm -rf $(DEP_DIR)*.d
+
+docu:
+	doxygen
 
-flash:
-	$(ERASECMD)
-	$(FLASHCMD)
-	
-lst:  $(PRG).lst
 
 %.lst: %.elf
 	$(OBJDUMP) -h -S $< > $@
 
 # Rules for building the .text rom images
 
-text: hex bin srec
-
-hex:  $(PRG).hex
-bin:  $(PRG).bin
-srec: $(PRG).srec
-
 %.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: ehex ebin esrec
-
-ehex:  $(PRG)_eeprom.hex
-ebin:  $(PRG)_eeprom.bin
-esrec: $(PRG)_eeprom.srec
 
 %_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
@@ -213,12 +240,6 @@ esrec: $(PRG)_eeprom.srec
 FIG2DEV		 = fig2dev
 EXTRA_CLEAN_FILES       = *.hex *.bin *.srec
 
-dox: eps png pdf
-
-eps: $(PRG).eps
-png: $(PRG).png
-pdf: $(PRG).pdf
-
 
 %.eps: %.fig
 	$(FIG2DEV) -L eps $< $@
@@ -230,7 +251,8 @@ pdf: $(PRG).pdf
 	$(FIG2DEV) -L png $< $@
 
 
-DEPS := $(wildcard *.d)
+DEPS := $(wildcard $(DEP_DIR)*.d)
+
 ifneq ($(DEPS),)
 include $(DEPS)
 endif