X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=hw2%2Fmakefile;h=36f60c86d70f0e8370bd42c8c656c2588b928440;hb=HEAD;hp=e7c5b4006ffe77909e783aeed7958813a3f0dbb4;hpb=a9299548b2cae6dfe9050dd7d054c5496e5c07c3;p=~andy%2Fcsm213a-hw

diff --git a/hw2/makefile b/hw2/makefile
index e7c5b40..36f60c8 100644
--- a/hw2/makefile
+++ b/hw2/makefile
@@ -1,3 +1,5 @@
+-include config.mk
+
 # Common settings
 UART0    = /dev/ttyACM0
 UART1    = /dev/ttyACM1
@@ -7,9 +9,7 @@ CPPFLAGS =
 LDFLAGS  = -lm
 
 # Common rules
-default: all
-
-all: mbed.elf tester.elf control
+all: mbed.bin tester.bin control
 
 terms:
 	test -c $(UART0) && term $(UART0) &
@@ -19,15 +19,17 @@ dist:
 	zip mbed.zip makefile ../common.mk *.{c,cpp,h} */*.{cpp,.h}
 
 # Primary mbed (mbed1/mbed2)
-mbed.elf: main.o serial_irq.o serial_dma.o timer_dma.o
+mbed.elf: main.o main_time.o main_emit.o main_comm.o \
+	serial_irq.o serial_dma.o timer_dma.o messages.o
 
 mbed-run: mbed.bin control install.sh
 	@./install.sh $<
-	@./control $(UART0) 1
-	@./control $(UART1) 2 sync
+	@./control -d1    $(UART0)
+	@./control -d2    $(UART0)
+	@./control -d2 -y $(UART0)
 
 # Testing mbed (mbed3)
-tester.elf: tester.o
+tester.elf: tester.o serial_irq.o timer_dma.o messages.o
 
 tester-run: tester.bin install.sh
 	@./install.sh $< /dev/sdb /mnt/usb