From: ian <ian>
Date: Sun, 15 May 2005 23:54:41 +0000 (+0000)
Subject: include morse-auto in morsepanice.hex
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=63cbe70f97cb0f8d085f27450dd7fab388f44f9b;p=trains.git

include morse-auto in morsepanice.hex
---

diff --git a/cebpic/Makefile b/cebpic/Makefile
index bdcaf11..1cf258e 100644
--- a/cebpic/Makefile
+++ b/cebpic/Makefile
@@ -3,7 +3,7 @@ PROGRAMS=	led-flash send-serial panic reply-serial	\
 		i2c-test i2c-test,slow morsepanic
 # booster-output-low  -disabled because you forgot to cvs add it
 
-ROUTINES=	routines-led morse-auto
+ROUTINES=	routines-led
 
 INCLUDES=	common.inc morse-auto.inc ../iwjpictest/insn-aliases.inc
 
@@ -17,7 +17,7 @@ include ../common.make
 include ../pic.make
 
 clean:		pic-clean
-		rm -f idlocs*.asm
+		rm -f idlocs*.asm routines.lib
 
 routines.lib:	$(addsuffix .o, $(ROUTINES))
 		rm -f $@.new
@@ -31,13 +31,15 @@ morse-auto.inc morse-auto.asm: \
  morse-auto.%: morse-auto.asm-gen morse-auto.messages
 		./$^ $* $o
 
+morsepanic.hex morsepanic-withcfg.hex: morsepanic.o morse-auto.o
+
 %,slow.o:	%.asm
 		$(ASSEMBLE) -D SLOW_VERSION -c -o $@ $<
 
 idlocs%.asm:	make-idlocs
 		./$< $* >$@.new && mv -f $@.new $@
 
-perpic%.hex:	config.o idlocs%.o $(LIBS()
+perpic%.hex:	config.o idlocs%.o $(LIBS)
 		$(LINK)
 
 %-entire0.hex:	%.o config.o idlocs0.o routines.lib