X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=f96968f9015943f797d3ec73891c31ce2c0e5386;hp=c6745313139015f8dbdb4c4478bb6bb0f02cd216;hb=c1ef7ebcf885f8eac4fb047a376393fc7c7de196;hpb=3ca6e2dc2aa0d4706fdcfc6a390c8f3f6419251d

diff --git a/firmware/Makefile b/firmware/Makefile
index c674531..f96968f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -26,15 +26,15 @@ platform?=goodfet
 GCCINC=-T ldscripts/$(mcu).x
 
 CCEXTRA?=
-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -Dplatform=$(platform) -DGCC $(GCCINC) -I include $(CCEXTRA)
+CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include $(CCEXTRA)
 
 #Define extra modules here.
 #moreapps?=apps/i2c/i2c.o  apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
-moreapps?=apps/jtag/sbw.o
+moreapps?=apps/jtag/sbw.o apps/glitch/glitch.o
 # should include apps/jtag/jtagarm7tdmi.o to build jtag for ARM7
 # should include apps/pic/dspic33f.o to build support for PIC24H/dsPIC33F
 
-apps= $(moreapps) apps/chipcon/chipcon.o apps/radios/nrf.o apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o 
+apps= $(moreapps) apps/chipcon/chipcon.o apps/radios/nrf.o apps/radios/ccspi.o apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o 
 
 #apps/chipcon/chipconasm.o removed
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o  lib/dco_calib.o
@@ -43,13 +43,13 @@ app= goodfet
 
 all: $(app).hex
 
-lib/.o:
+lib/.o: config
 	./configure
 	false
 lib/RUNCONFIG.o:
 	./configure
 	false
-include/config.h:
+config:
 	cp platforms/$(platform).h include/config.h
 goodfet.hex: goodfet
 
@@ -63,6 +63,7 @@ verify:
 	$(BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
 	$(BSL) --dumpinfo
+$(app).c: config
 $(app): $(app).c $(libs) $(apps)
 $(app).hex: $(app)
 	msp430-objcopy goodfet -O ihex goodfet.hex
@@ -76,4 +77,4 @@ docs:
 	doxygen
 pushdocs: docs
 	rsync --exclude .svn -ave ssh doc/html/* travisutk,goodfet@web.sourceforge.net:htdocs/docs/
-.FAKE: docs include/config.h
+.FAKE: docs