X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=5993599593ee84ef208eef8ab6a724d8fcb391c5;hb=8537c7a0647b533f078af9c35bce533335c7556e;hp=3761ed5f0bff2d079f2e5c1c32dbbdd544925770;hpb=6725841b72687bd3ede509c41ac50746c6bd1828;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 3761ed5..5993599 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,91 @@
-PRG        = serpent-test
-#PRG	    = tdes-test
-# camellia
-# cryptotest
-SERPENT_OBJ     = main-serpent-test.o debug.o uart.o serial-tools.o serpent.o nessie_bc_test.o
-CAMELLIA_OBJ	= main-camellia-test.o debug.o uart.o serial-tools.o camellia.o camellia-asm.o
-SKIPJACK_OBJ	= main-skipjack-test.o debug.o uart.o serial-tools.o skipjack.o
-SHA1_OBJ		= main-sha1-test.o debug.o uart.o serial-tools.o sha1-asm.o
-MD5_OBJ			= main-md5-test.o debug.o uart.o serial-tools.o md5.o
-CAST5_OBJ		= main-cast5-test.o debug.o uart.o serial-tools.o cast5.o
-RC6_OBJ			= main-rc6-test.o debug.o uart.o serial-tools.o rc6.o
-Multi_OBJ		= main.o debug.o uart.o serial-tools.o sha256-asm.o xtea-asm.o arcfour-asm.o prng.o cast5.o
-DES_OBJ			= main-des-test.o debug.o uart.o serial-tools.o des.o
-TDES_OBJ	    = main-tdes-test.o debug.o uart.o serial-tools.o des.o
-SEED_OBJ	    = main-seed-test.o debug.o uart.o serial-tools.o seed.o seed-asm.o
-SHABEA_OBJ	    = main-shabea-test.o debug.o uart.o serial-tools.o shabea.o sha256-asm.o
-
-OBJ = $(SERPENT_OBJ)
-MCU_TARGET     = atmega32
-OPTIMIZE       = -Os
-
-FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:$(PRG).hex
-#  -U eeprom:w:$(PRG)_eeprom.hex
-#uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
-ERASECMD       = 
+# Makefile for the micro-crypt project
+# author: Daniel Otte
 
-DEFS	   =
-LIBS	   =
+BLOCK_CIPHERS  := 
+STREAM_CIPHERS := 
+HASHES         :=
+MACS           :=
+PRNGS          := 
 
-# You should not have to change anything below here.
 
-CC	     = avr-gcc
+include avr-makefile.inc
+include *.mk
 
-# Override is only needed by avr-lib build system.
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
+ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
+ALGORITHMS_OBJ_IMM = $(foreach a, $(ALGORITHMS_OBJ), $($(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))
 
-override CFLAGS	= -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) 
-$(DEFS)
-override LDFLAGS       = -Wl,-Map,$(PRG).map
-override ASFLAGS	   = -mmcu=$(MCU_TARGET)
+ALGORITHMS_TEST_BIN_IMM =  $(foreach a, $(ALGORITHMS_TEST_BIN), $($(a)))
+ALGORITHMS_NESSIE_TEST = $(patsubst %,%_NESSIE_TEST, $(ALGORITHMS))
+ALGORITHMS_PERFORMANCE_TEST = $(patsubst %,%_PERORMANCE_TEST, $(ALGORITHMS))
 
-OBJCOPY	= avr-objcopy
-OBJDUMP	= avr-objdump
+PRG = remove_me
 
-all: $(PRG).elf lst text eeprom
+#Multi_OBJ		= main.o debug.o uart.o serial-tools.o sha256-asm.o xtea-asm.o arcfour-asm.o prng.o cast5.o
 
-$(PRG).elf: $(OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+#OBJ = $(SERPENT_OBJ)
 
-#rc6-test: 
+DEFS	   =
+LIBS	   =
 
+define BLA_TEMPLATE2
+$(2): $(3)
+	echo $$@
+	echo $$^
+	$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
+	$(2) \
+	$(3) \
+	$(LIBS)
+endef
+
+$(foreach algo, $(ALGORITHMS), $(eval $(call BLA_TEMPLATE2, $(algo), $(patsubst %.o,%.elf,$(firstword $($(algo)_TEST_BIN))), $($(algo)_TEST_BIN) )))
+
+.PHONY: info
+info:
+	@echo "infos on micro-crypt:"
+	@echo "  block ciphers:"
+	@echo "    $(BLOCK_CIPHERS)"
+	@echo "  stream ciphers:"
+	@echo "    $(STREAM_CIPHERS)"
+	@echo "  hash functions:"
+	@echo "    $(HASHES)"
+	@echo "  MAC functions:"
+	@echo "    $(MACS)"
+	@echo "  PRNG functions:"
+	@echo "    $(PRNGS)"
+#	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)
+
+bc:	$(ALGORITHMS_OBJ)
+
+tests: $(ALGORITHMS_TEST_BIN) \
+       $(ALGORITHMS_TEST_BIN_MAIN_ELF) \
+       $(ALGORITHMS_TEST_BIN_MAIN_HEX)
+
+
+$(ALGORITHMS_OBJ):  $(ALGORITHMS_OBJ_IMM)
+$(ALGORITHMS_TEST_BIN): $(ALGORITHMS_TEST_BIN_IMM)
+
+#$(ALGORITHMS):  
+	
+.PHONY: all
+all: $(PRG).elf lst text eeprom
+
+
+.PHONY: clean
 clean:
-	rm -rf *.o $(PRG).elf *.eps *.png *.pdf *.bak 
+	rm -rf *.o *.elf *.eps *.png *.pdf *.bak 
 	rm -rf *.lst *.map $(EXTRA_CLEAN_FILES)
 
 flash:
@@ -95,6 +131,11 @@ esrec: $(PRG)_eeprom.srec
 %_eeprom.bin: %.elf
 	$(OBJCOPY) -j .eeprom --change-section-lma .eeprom=0 -O binary $< $@
 
+%_size.txt: %.o
+	$(SIZE)  $< > $@
+	
+	
+	
 # Every thing below here is used by avr-libc's build system and can be ignored
 # by the casual user.
 
@@ -107,6 +148,7 @@ eps: $(PRG).eps
 png: $(PRG).png
 pdf: $(PRG).pdf
 
+
 %.eps: %.fig
 	$(FIG2DEV) -L eps $< $@