X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=avr-makefile.inc;h=f656cd3dabd16c158d04dec16fcd0b504c18e03e;hb=cecf2faff1f8aeeb4c46d3d608d5dc0839bb9fdc;hp=323786abf3024a9fa7ceb4ff3fd68a8fd218ca35;hpb=52ec168ece9d61bd9cb652235dfe8faee6232a11;p=avr-crypto-lib.git

diff --git a/avr-makefile.inc b/avr-makefile.inc
index 323786a..f656cd3 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,30 +1,35 @@
 
 MCU_TARGET     = atmega644
-OPTIMIZE       = -Os
+OPTIMIZE       = -Os # -Os
 PROGRAMMER     = avr911
 DEFS           = -D$(call uc, $(MCU_TARGET))
 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  = 38400
-TESTLOG_DIR    = testlog/
+TESTLOG_DIR    = testlog/#
 TESTPREFIX     = nessie-
+SPEEDTOOL      = host/get_performance.rb
 SPEEDLOG_DIR   = speed_log/
 SPEEDPREFIX    =
-LIST_DIR       = listings/
-STAT_DIR       = stats/
-AUTOASM_DIR    = autoasm/
+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,$(patsubst $(TESTSRC_DIR)%,%,$<)) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS_A	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS 	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@)) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
 override LDFLAGS       = -gdwarf-2 -Wl,-Map,
 override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
@@ -37,7 +42,6 @@ SIZE            = avr-size
 READELF         = readelf
 RUBY            = ruby
 GET_TEST        = host/get_test.rb
-GET_PERFORMANCE = host/get_performance.rb
 MAKE            = make
 MAKE2GRAPH      = ~/bin/make2graph.rb
 TWOPI           = twopi