@@ -1,38 +1,40 @@
 
 PREFIX=.
+CSCOPTS= 
 
 SRCFILES = common.scm items.scm launch.scm \
            ods.scm runconfig.scm server.scm configf.scm \
            db.scm keys.scm margs.scm megatest-version.scm \
-           process.scm runs.scm tasks.scm
+           process.scm runs.scm tasks.scm tests.scm
 
-GUISRCF  = dashboard.scm dashboard-tests.scm dashboard-guimonitor.scm
+GUISRCF  = dashboard.scm dashboard-tests.scm dashboard-guimonitor.scm dashboard-main.scm
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 HELPERS=$(addprefix $(PREFIX)/bin/,mt_laststep mt_runstep mt_ezstep)
 
 all : megatest dboard
 
 megatest: $(OFILES) megatest.o
-	csc $(OFILES) megatest.o -o megatest
+	csc $(CSCOPTS) $(OFILES) megatest.o -o megatest
 
 dboard : $(OFILES) $(GOFILES)
 	csc $(OFILES) $(GOFILES) -o dboard
 
 # Special dependencies for the includes
-db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o monitor.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
-tasks.o dashboard-tasks.o : task_records.scm
+tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o megatest.o : db_records.scm
+tests.o runs.o dashboard.o dashboard-tests.o dashboard-main.o  : run_records.scm
+db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
+tests.o tasks.o dashboard-tasks.o : task_records.scm
+runs.o : test_records.scm
 
 $(OFILES) $(GOFILES) : common_records.scm 
 
 %.o : %.scm
-	csc -c $<
+	csc $(CSCOPTS) -c $<
 
 $(PREFIX)/bin/megatest : megatest
 	@echo Installing to PREFIX=$(PREFIX)
 	cp megatest $(PREFIX)/bin/megatest
 
@@ -48,18 +50,16 @@
 # install dashboard as dboard so wrapper script can be called dashboard
 $(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 : bin $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake
 
 bin : 
-	mkdir $(PREFIX)/bin
+	mkdir -p $(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