X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=Makefile;h=f233faf74c69bb4ebd2c6bf71f66d86f06dc21fd;hb=4e31ebdb0529eeb61efd3fe181b9de1abe6d7f6c;hp=75876cfb8a26567a6aeabdcf40f2c586d356021a;hpb=86af17284402f8198778fcb63a67f0503c1e48c8;p=avr-crypto-lib.git

diff --git a/Makefile b/Makefile
index 75876cf..f233faf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Makefile for the micro-crypt project
+# Makefile for the AVR-Crypto-Lib project
 # author: Daniel Otte
 
 BLOCK_CIPHERS  := 
@@ -6,13 +6,14 @@ STREAM_CIPHERS :=
 HASHES         :=
 MACS           :=
 PRNGS          := 
+ENCODINGS      :=
 
 # we use the gnu make standard library
 include gmsl
 include avr-makefile.inc
 include mkfiles/*.mk
 
-ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS)
+ALGORITHMS = $(BLOCK_CIPHERS) $(STREAM_CIPHERS) $(HASHES) $(PRNGS) $(MACS) $(ENCODINGS)
 ALGORITHMS_OBJ = $(patsubst %,%_OBJ, $(ALGORITHMS))
 ALGORITHMS_TEST_BIN = $(patsubst %,%_TEST_BIN, $(ALGORITHMS))
 
@@ -43,7 +44,7 @@ all: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 
 define MAIN_OBJ_TEMPLATE
 $(2): $(3) $(4)
-	@echo "[ld]: $$@"
+	@echo "[ld] : $$@"
 #	echo $$^
 	@$(CC) $(CFLAGS) $(LDFLAGS)$(patsubst %.elf,%.map,$(2)) -o \
 	$(2) \
@@ -65,7 +66,7 @@ $(foreach algo, $(ALGORITHMS), $(eval $(call MAIN_OBJ_TEMPLATE, \
 help: info
 
 info:
-	@echo "infos on micro-crypt:"
+	@echo "infos on AVR-Crypto-lib:"
 	@echo "  block ciphers:"
 	@echo "    $(BLOCK_CIPHERS)"
 	@echo "  stream ciphers:"
@@ -76,6 +77,8 @@ info:
 	@echo "    $(MACS)"
 	@echo "  PRNG functions:"
 	@echo "    $(PRNGS)"
+	@echo "  encodings:"
+	@echo "    $(ENCODINGS)"
 #	@echo "  ALGORITHMS_TEST_BIN:"
 #	@echo "    $(ALGORITHMS_TEST_BIN)"
 #	@echo "  ALGORITHMS_TEST_TARGET_ELF:"
@@ -120,6 +123,15 @@ $(TESTBIN_DIR)%.o: $(TESTSRC_DIR)%.S
 	@echo "[as] :  $@"
 	@$(CC) $(ASFLAGS) -c -o $@ $<
 
+$(TESTBIN_DIR)%.o: %.c
+	@echo "[gcc]:  $@"
+	@$(CC) $(CFLAGS)  -c -o $@ $<
+
+$(TESTBIN_DIR)%.o: %.S
+	@echo "[as] :  $@"
+	@$(CC) $(ASFLAGS) -c -o $@ $<
+
+
 
 %.o: %.c
 	@echo "[gcc]:  $@"
@@ -155,6 +167,7 @@ $(STREAM_CIPHERS_OBJ): $(patsubst %,%_OBJ, $(STREAM_CIPHERS))
 $(HASHES_OBJ): $(patsubst %,%_OBJ, $(HASHES))
 $(PRNGS_OBJ): $(patsubst %,%_OBJ, $(PRNGS))
 $(MACS_OBJ): $(patsubst %,%_OBJ, $(MACS))
+$(ENCODINGS_OBJ): $(patsubst %,%_OBJ, $(ENCODINGS))
 
 #-------------------------------------------------------------------------------
 
@@ -232,6 +245,9 @@ macs: $(patsubst %, %_OBJ, $(MACS))
 .PHONY:  prngs
 prngs: $(patsubst %, %_OBJ, $(PRNGS))
 
+.PHONY:  encodings
+encodings: $(patsubst %, %_OBJ, $(ENCODINGS))
+
 tests: $(ALGORITHMS_TEST_BIN) \
        $(ALGORITHMS_TEST_TARGET_ELF) \
        $(ALGORITHMS_TEST_TARGET_HEX)
@@ -251,7 +267,7 @@ clean:
 	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
+	rm -rf $(DEP_DIR)*.d $(AUTOASM_DIR)*.s
 
 docu:
 	doxygen
@@ -301,10 +317,14 @@ make-info: make.png make.svg
 	@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
-# by the casual user.
+#-------------------------------------------------------------------------------
+$(AUTOASM_DIR)%.s: %.c
+	$(CC) $(CFLAGS) $(AUTOASM_OPT) -o $@ $<
+
+%.s: %.c
+	$(CC) $(CFLAGS) $(AUTOASM_OPT) -o $@ $<
 
+#-------------------------------------------------------------------------------
 FIG2DEV		 = fig2dev
 EXTRA_CLEAN_FILES       = *.hex *.bin *.srec