[tuxdroid-svn] r865 - in firmware: tuxaudio/trunk tuxcore/trunk

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2008-01-21 16:45:31 +0100 (Mon, 21 Jan 2008)
New Revision: 865

Modified:
   firmware/tuxaudio/trunk/Makefile
   firmware/tuxcore/trunk/Makefile
Log:
* Oops, reverting 863.


Modified: firmware/tuxaudio/trunk/Makefile
===================================================================
--- firmware/tuxaudio/trunk/Makefile	2008-01-21 15:39:30 UTC (rev 864)
+++ firmware/tuxaudio/trunk/Makefile	2008-01-21 15:45:31 UTC (rev 865)
@@ -38,7 +38,11 @@
 CINCS =
 
 # Compile options common for all C compilation units.
+ifdef windir
+CDEBUG = -gdwarf-2
+else
 CDEBUG = -g
+endif
 CWARN = -Wall -Wstrict-prototypes
 CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 CFLAGS = $(COMMON) $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
@@ -132,17 +136,29 @@
 
 size: ${TARGET}
 	@echo
+ifdef windir
+	@avr-size -C --mcu=${MCU} ${TARGET}
+else
 	@avr-size ${TARGET}
+endif
 
 bl_size: ${BOOTLOADER}
 	@echo
+ifdef windir
+	@avr-size -C --mcu=${MCU} ${BOOTLOADER}
+else
 	@avr-size ${BOOTLOADER}
+endif
 
 ## Generate SVN info
 #  We need to change the status each time a file changes, thus so many
 #  dependencies
 svnrev.h: $(CSOURCE) $(HEADERS)
+ifdef windir
+	SubWCRev . svnrev.tmpl.h svnrev.h
+else
 	svnwcrev . svnrev.tmpl.h svnrev.h
+endif
 
 ## Clean target
 .PHONY: clean
@@ -153,6 +169,16 @@
 ## Other dependencies
 -include $(shell mkdir dep 2>/dev/null) $(wildcard dep/*)
 
+## Generate doxygen documentation
+.PHONY: doc
+doc: svnrev.h
+ifdef windir
+	# XXX add windows version
+else
+	@./doc/builddoc.sh
+endif
+
+
 # Programming
 prog: $(PROJECT).hex
 	tuxup $(PROJECT).hex $(PROJECT).eep

Modified: firmware/tuxcore/trunk/Makefile
===================================================================
--- firmware/tuxcore/trunk/Makefile	2008-01-21 15:39:30 UTC (rev 864)
+++ firmware/tuxcore/trunk/Makefile	2008-01-21 15:45:31 UTC (rev 865)
@@ -55,7 +55,11 @@
 CINCS =
 
 # Compile options common for all C compilation units.
+ifdef windir
+CDEBUG = -gdwarf-2
+else
 CDEBUG = -g
+endif
 CWARN = -Wall -Wstrict-prototypes
 CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 CFLAGS = $(COMMON) $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) \
@@ -140,7 +144,12 @@
 #  We need to change the status each time a file changes, thus so many
 #  dependencies
 svnrev.h: $(CSOURCE) $(HEADERS)
+
+ifdef windir
+	SubWCRev . svnrev.tmpl.h svnrev.h
+else
 	svnwcrev . svnrev.tmpl.h svnrev.h
+endif
 
 ##Link
 $(TARGET): $(OBJECTS)
@@ -161,11 +170,19 @@
 
 size: ${TARGET}
 	@echo
+ifdef windir
+	@avr-size -C --mcu=${MCU} ${TARGET}
+else
 	@avr-size ${TARGET}
+endif
 
 bl_size: ${BOOTLOADER}
 	@echo
+ifdef windir
+	@avr-size -C --mcu=${MCU} ${BOOTLOADER}
+else
 	@avr-size ${BOOTLOADER}
+endif
 
 ## Clean target
 .PHONY: clean
@@ -178,6 +195,15 @@
 ## Other dependencies
 -include $(shell mkdir dep 2>/dev/null) $(wildcard dep/*)
 
+## Generate doxygen documentation
+.PHONY: doc
+doc: svnrev.h
+ifdef windir
+	# XXX add windows version
+else
+	@./doc/builddoc.sh
+endif
+
 # Programming
 prog: $(PROJECT).hex
 	tuxup $(PROJECT).hex $(PROJECT).eep