-OPTIMIZE = -Os
-DEFS = -DATMEGA644
-FLASHCMD = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c avr911 -U flash:w:$(PRG).hex
-# -U eeprom:w:$(PRG)_eeprom.hex
+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 $(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/
+TESTSRC_DIR = test_src/