X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=avr-makefile.inc;h=121f0293ec548714b9df78aed6ed273d94d6d72e;hp=0e09617d635b269fb00326303adddcc8b587c465;hb=69d6349f8ad9d35c2acdb4e4e38ad42cd28b426c;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab

diff --git a/avr-makefile.inc b/avr-makefile.inc
index 0e09617..121f029 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,29 +1,48 @@
 
-OBJ = $(SERPENT_OBJ)
 MCU_TARGET     = atmega644
-OPTIMIZE       = -Os
+OPTIMIZE       = -Os # -Os
+DEBUG          = -gdwarf-2
+WARNING        = -pedantic -Wall -Wstrict-prototypes
+PROGRAMMER     = 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/
+TEST_DIR       = test/
 BIN_DIR        = bin/
-TESTBIN_DIR    = test_bin/
 TESTSRC_DIR    = test_src/
 #uisp -dprog=bsd -dlpt=/dev/parport1 --upload if=$(PRG).hex
-ERASECMD       = 
+ERASECMD       =
 TESTPORT       = /dev/ttyUSB1
-TESTPORTBAUDR  = 9600
-TESTLOG_DIR    = testlog/
+TESTPORTBAUDR  = 115200
+TESTLOG_DIR    = testlog/#
 TESTPREFIX     = nessie-
-CC	     = avr-gcc
+SPEEDTOOL      = host/get_performance.rb
+SPEEDLOG_DIR   = speed_log/
+SPEEDPREFIX    =
+SPEEDCMD       = performance
+SIZE_DIR       = size_log/#
+LIST_DIR       = listings/#
+STAT_DIR       = stats/#
+AUTOASM_DIR    = autoasm/#
+AUTOASM_OPT    = -S
+CC	       = avr-gcc
+CSTD           = c99
 
-override CFLAGS	= -MMD -MF$(DEP_DIR)$(patsubst %.c,%.d,$<) -I. -pedantic -std=c99 -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS_A	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS 	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@))   $(DEBUG) $(WARNING) -std=$(CSTD) $(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
 
-OBJCOPY	= avr-objcopy
-OBJDUMP	= avr-objdump
-SIZE = avr-size
-RUBY = ruby
+OBJCOPY         = avr-objcopy
+OBJDUMP         = avr-objdump
+SIZE            = avr-size
+READELF         = readelf
+RUBY            = ruby
+GET_TEST        = host/get_test.rb
+MAKE            = make
+MAKE2GRAPH      = ~/bin/make2graph.rb
+TWOPI           = twopi