modification to the build system

[avr-crypto-lib.git] / Makefile

diff --git a/Makefile b/Makefile
index e72513346c294da2825890ffc8091b7f55badf1c..00d1f5f3f935dbcc5898a9351c2f23be7fe9913b 100644 (file)
--- 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)
+define MAIN_OBJ_TEMPLATE
+$(2): $(3) $(4)
        @echo "[gcc]: $$@"
 #      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,11 @@ 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,6 +87,15 @@ $(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 $@ $<
@@ -101,8 +124,8 @@ 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)
@@ -149,11 +172,24 @@ $(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 $(BIN_DIR)*.o *.o $(TESTBIN_DIR)*.elf $(TESTBIN_DIR)* *.elf *.eps *.png *.pdf *.bak *_size.txt
@@ -161,9 +197,9 @@ clean:
 xclean: clean
        rm -rf $(DEP_DIR)*.d
 
-flash:
-       $(ERASECMD)
-       $(FLASHCMD)
+docu:
+       doxygen
+
 
 %.lst: %.elf
        $(OBJDUMP) -h -S $< > $@