* I2C: Don't get stuck, if pullups are missing (timeout error)

[avrcpm.git] / avr / Makefile

diff --git a/avr/Makefile b/avr/Makefile
index c6f2b3547a0b84fb0bb68f3a2368816b569ad6e9..efc5b1c04e6c93cc39db1f175d9e049687e7c287 100644 (file)
--- a/avr/Makefile
+++ b/avr/Makefile
@@ -10,28 +10,46 @@ BAUD = 57600
 #BAUD = 115200
 
 DRAM_8BIT = 1
+#I2C = 1
 
 TARGET = avrcpm
-ASRC  = avrcpm.asm 
+ASRC0  = avrcpm.asm 
 
-ASRC += config.inc macros.inc init.asm dram-refresh.asm timer.asm utils.asm 
-ASRC += mmc.asm mmc-old.asm virt_ports.asm
-ASRC += dsk_cpm.asm dsk_fat16.asm dsk_fsys.asm dsk_mgr.asm dsk_ram.asm 
-ASRC += 8080int.asm 8080int-jmp.asm 8080int-t3.asm 8080int-t3-jmp.asm 
+ASRC0 += config.inc macros.inc init.asm dram-refresh.asm timer.asm utils.asm 
+ASRC0 += mmc.asm mmc-old.asm virt_ports.asm
+ASRC0 += dsk_cpm.asm dsk_fat16.asm dsk_fsys.asm dsk_mgr.asm dsk_ram.asm 
+ASRC0 += 8080int-orig.asm 8080int.asm 8080int-jmp.asm 8080int-t3.asm 8080int-t3-jmp.asm Z80int-jmp.asm
 
 ifneq ($(DRAM_8BIT),0)
-  ASRC += dram-8bit.inc dram-8bit.asm sw-uart.asm 
+  ASRC0 += dram-8bit.inc dram-8bit.asm sw-uart.asm i2c.asm
 else
-  ASRC += dram-4bit.inc dram-4bit.asm hw-uart.asm 
+  ASRC0 += dram-4bit.inc dram-4bit.asm hw-uart.asm 
 endif
 
+#ASRC := $(ASRC0) svnrev.inc
+ASRC := $(ASRC0) svnrev.inc
+
 # Place -D or -U options here
-CDEFS = -DF_CPU=$(F_CPU) -DBAUD=$(BAUD) -D$(MCU) -DDRAM_8BIT=$(DRAM_8BIT)
+CDEFS = -DF_CPU=$(F_CPU) -DBAUD=$(BAUD) -D$(MCU) -DDRAM_8BIT=$(DRAM_8BIT) 
+ifdef I2C
+  CDEFS += -DI2C=$(I2C)
+endif
+
+ASPATH = C:/Programme/Atmel/AVR\ Tools/AvrAssembler2
+DEFS = $(ASPATH)/Appnotes
+
+ifeq "$(OS)" "Windows_NT"
+  PLATFORM=win32
+else
+  PLATFORM=Linux
+endif
 
-WINEPATH = C:/Programme/Atmel/AVR\ Tools/AvrAssembler2
-DEFS = $(WINEPATH)/Appnotes
+WINE =
+ifeq ($(PLATFORM),Linux)
+  WINE = wine
+endif
 
-AS = wine $(WINEPATH)/avrasm2.exe
+AS = $(WINE) $(ASPATH)/avrasm2.exe
 ASFLAGS = -I $(DEFS) $(CDEFS)
 
 # Programming support using avrdude. Settings and variables.
@@ -114,7 +132,8 @@ $(TARGET).map: $(ASRC)
 tags: $(SRC) $(ASRC)
        ctags $(SRC) $(ASRC)
 
-
+svnrev.inc: $(ASRC0)
+       @svnrev -osvnrev.inc $^
 
 # Target: clean project.
 clean: