X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-makefile.inc;h=e65e58530f0dae5436865519ef6d40e1732a0a78;hb=8ef8dfdc7299ac1c30869ec6ad4d11276f0cf5db;hp=0fe9e4f337870a35ee6b1f8137f4b76a0fd042f6;hpb=96ebafd201c9e8441c7677577b24aa402c1defc6;p=avr-crypto-lib.git

diff --git a/avr-makefile.inc b/avr-makefile.inc
index 0fe9e4f..e65e585 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,19 +1,29 @@
 
-OBJ = $(SERPENT_OBJ)
 MCU_TARGET     = atmega644
 OPTIMIZE       = -Os
+PROGRAMMER     = stk500 # avr911
 DEFS           = -D$(call uc, $(MCU_TARGET))
-FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:# no space at the end
-
+FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c $(PROGRAMMER) -U flash:w:# no space at the end
+#FLASHCMD       = avrdude -p $(MCU_TARGET) -c usbasp -U flash:w:# no space at the end
+DEP_DIR        = deps/
+BIN_DIR        = bin/
+TESTBIN_DIR    = test_bin/
+TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
 ERASECMD       = 
+TESTPORT       = /dev/ttyUSB1
+TESTPORTBAUDR  = 38400
+TESTLOG_DIR    = testlog/
+TESTPREFIX     = nessie-
+LIST_DIR       = listings/
+STAT_DIR       = stats/
+CC	       = avr-gcc
+CSTD           = c99
 
-CC	     = avr-gcc
-
-override CFLAGS	= -MMD -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS	= -MMD -MF$(DEP_DIR)$(patsubst %.c,%.d,$(patsubst $(TESTSRC_DIR)%,%,$<)) -I. -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
-override LDFLAGS       = -Wl,-Map,
-override ASFLAGS	   = -mmcu=$(MCU_TARGET)
+override LDFLAGS       = -gdwarf-2 -Wl,-Map,
+override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
 
 SIZESTAT_FILE = sizestats.txt
 
@@ -21,3 +31,7 @@ OBJCOPY	= avr-objcopy
 OBJDUMP	= avr-objdump
 SIZE = avr-size
 RUBY = ruby
+GET_TEST = host/get_test.rb
+MAKE = make
+MAKE2GRAPH = ~/bin/make2graph.rb
+TWOPI = twopi