include morse-auto in morsepanice.hex

diff --git a/cebpic/Makefile b/cebpic/Makefile
index bdcaf1160412740fa5a1d337da5e3486ca5fceac..1cf258e222db2cad7be36bb89d6f5c256bf2ecea 100644 (file)
--- 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