X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=c06b398b758b64107bd5874df88cdc13e9edc555;hb=981c5b71dd5c99d080b9f36b0db9a211eeef494f;hp=efae2b4f89b3acd85a4830ffc2998362bf2fc6e4;hpb=dd02da3bd4b9c9a84f68150b5cba987b73fd29af;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index efae2b4..c06b398 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,7 @@ $(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)))
@@ -41,18 +38,24 @@ 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 BLA_TEMPLATE2, $(algo), $(TESTBIN_DIR)main-$(call lc,$(algo))-test.elf, $(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
@@ -70,6 +73,8 @@ 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)"
 	
@@ -82,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 $@ $<
@@ -183,35 +197,44 @@ clean:
 xclean: clean
 	rm -rf $(DEP_DIR)*.d
 
-flash:
-	$(ERASECMD)
-	$(FLASHCMD)
+docu:
+	doxygen
+
 
 %.lst: %.elf
 	$(OBJDUMP) -h -S $< > $@
 
+%.lst: %.o
+	$(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