@@ -11,21 +11,22 @@
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 HELPERS=$(addprefix $(PREFIX)/bin/,mt_laststep mt_runstep)
 
-all : megatest dashboard
+all : megatest dboard
 
 megatest: $(OFILES) megatest.o
 	csc $(OFILES) megatest.o -o megatest
 
-dashboard: $(OFILES) $(GOFILES)
-	csc $(OFILES) $(GOFILES) -o dashboard
+dboard : $(OFILES) $(GOFILES)
+	csc $(OFILES) $(GOFILES) -o dboard
 
-db.o launch.o runs.o : db_records.scm
-
-keys.o db.o runs.o launch.o  : key_records.scm
+# Special dependencies for the includes
+db.o launch.o runs.o dashboard-tests.o dashboard.o megatest.o : db_records.scm
+runs.o dashboard.o dashboard-tests.o   : run_records.scm
+keys.o db.o runs.o launch.o megatest.o : key_records.scm
 
 $(OFILES) $(GOFILES) : common_records.scm 
 
 %.o : %.scm
 	csc -c $<
@@ -38,17 +39,22 @@
 $(HELPERS)  : utils/mt_*
 	cp $< $@
 	chmod a+x $@
 
 # install dashboard as dboard so wrapper script can be called dashboard
-$(PREFIX)/bin/dboard : dashboard $(FILES)
+$(PREFIX)/bin/dboard : dboard $(FILES)
 	cp dboard $(PREFIX)/bin/dboard
 	utils/mk_dashboard_wrapper $(PREFIX) > $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
 	utils/mk_dashboard_wrapper $(PREFIX) > $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
 
-install : $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS)
+install : bin $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS)
+
+bin : 
+	mkdir $(PREFIX)/bin
 
 test: tests/tests.scm
 	cd tests;csi -I .. -b -n tests.scm
 
+clean : 
+	rm -f $(OFILES) $(GOFILES) megatest dboard dboard.o megatest.o