@@ -21,28 +21,16 @@
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
 SRCFILES =
 
-# common.scm items.scm launch.scm ods.scm runconfig.scm	\
-#            server.scm configf.scm db.scm keys.scm margs.scm		\
-#            process.scm runs.scm tasks.scm tests.scm genexample.scm	\
-#            http-transport.scm filedb.scm tdb.scm client.scm mt.scm	\
-#            ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm		\
-#            subrun.scm portlogger.scm archive.scm env.scm		\
-#            diff-report.scm cgisetup/models/pgdb.scm
-
 # module source files
-# MSRCFILES = 
-# ftail.scm rmtmod.scm commonmod.scm removed
 MSRCFILES = autoload.scm dbi.scm ducttape-lib.scm pkts.scm stml2.scm	\
-            cookie.scm mutils.scm mtargs.scm apimod.scm commonmod.scm	\
-            dbmod.scm rmtmod.scm debugprint.scm mtver.scm csv-xml.scm	\
-            servermod.scm hostinfo.scm adjutant.scm 
-
-# commonmod.scm dbmod.scm adjutant.scm ulex.scm	\
-#            rmtmod.scm apimod.scm
+            cookie.scm mutils.scm mtargs.scm apimod.scm			\
+            configfmod.scm commonmod.scm dbmod.scm rmtmod.scm		\
+            debugprint.scm mtver.scm csv-xml.scm servermod.scm		\
+            hostinfo.scm adjutant.scm processmod.scm
 
 GUISRCF = dashboard-context-menu.scm dashboard-tests.scm		\
           dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm	\
           vg.scm
 
@@ -59,14 +47,20 @@
 mofiles/%.o : %.scm
 	mkdir -p mofiles
 	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
 
 # module dependencies
-mofiles/stml2.o : mofiles/dbi.o
+mofiles/stml2.o : mofiles/cookie.o mofiles/dbi.o
 mofiles/dbi.o   : mofiles/autoload.o
+
 mofiles/apimod.o mofiles/dbmod.o mofiles/rmtmod.o : mofiles/commonmod.o
-mofiles/commonmod.o : mofiles/mtargs.o mofiles/debugprint.o mofiles/megatest-version.o
+
+mofiles/commonmod.o : mofiles/mtargs.o mofiles/debugprint.o \
+                        mofiles/megatest-version.o mofiles/processmod.o \
+			mofiles/configfmod.o
+
+dashboard.o megatest.o : db_records.scm megatest-fossil-hash.scm
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
@@ -86,12 +80,12 @@
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 # all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
-mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES)  megatest-version.scm
-	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
+mtest: readline-fix.scm megatest.scm $(MOFILES) $(MOIMPFILES)  megatest-version.scm
+	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.scm -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
 dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) megatest-version.scm megatest-fossil-hash.scm
@@ -152,67 +146,14 @@
 
 $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql
 	mkdir -p $(PREFIX)/share/db
 	$(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql
 
-# Special dependencies for the includes
-$(MOFILE) $(MOIMPFILES) : megatest-fossil-hash.scm
-
-# common.o : mofiles/commonmod.o megatest-fossil-hash.scm
-mofiles/dbmod.o : mofiles/configfmod.o
-
-# commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm
-
-tests.o db.o launch.o runs.o dashboard-tests.o				\
-dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o	\
-monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm
-
-tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.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
-
-megatest.o : megatest-fossil-hash.scm megatest-version.scm *scm
-
-rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm
-
-common_records.scm : altdb.scm
-
-# mofiles/stml2.o : mofiles/cookie.o
-# configf.o : mofiles/commonmod.o
-
-vg.o dashboard.o : vg_records.scm megatest-version.scm
-
-dcommon.o : run_records.scm
-
-mofiles/stml2.o : mofiles/cookie.o
-
-# # special include based modules
-# mofiles/pkts.o      : pkts/pkts.scm
-# mofiles/stml2.o     : cookie.o
-# # mofiles/mtargs.o    : mtargs/mtargs.scm
-# # mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm
-# mofiles/ulex.o      : ulex/ulex.scm
-# mofiles/mutils.o    : mutils/mutils.scm
-# mofiles/cookie.o    : stml2/cookie.scm
-# mofiles/stml2.o     : stml2/stml2.scm
-
-# Temporary while transitioning to new routine
-# runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm
-
-# for the modularized stuff
-mofiles/rmtmod.o : mofiles/commonmod.o
-
 megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
 	echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new
 	if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi
 
-$(OFILES) $(GOFILES) : common_records.scm 
-
 %.o : %.scm $(MOFILES)
 	csc $(CSCOPTS) -c $< $(MOFILES)
 
 $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper
 	@echo Installing to PREFIX=$(PREFIX)
@@ -390,32 +331,10 @@
 #======================================================================
 
 # vg_records.scm : records.sh
 #	./records.sh
 
-#======================================================================
-# Deploy section (not complete yet)
-#======================================================================
-
-$(DEPLOYHELPERS) : utils/mt_*
-	$(INSTALL) $< $@
-	chmod a+X $@
-
-deploytarg/apropos.so : Makefile
-	chicken-install -p deploytarg -deploy -keep-installed $(EGGS)
-
-deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/remrun deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so
-
-# puts deployed megatest in directory "megatest"
-deploytarg/mtest : $(OFILES) megatest.o deploytarg/apropos.so
-	csc -deploy $(CSCOPTS) $(OFILES) megatest.scm -o deploytarg
-	mv deploytarg/deploytarg deploytarg/mtest
-
-deploytarg/dboard :  $(OFILES) $(GOFILES) dashboard.scm deploytarg/apropos.so
-	csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg
-	mv deploytarg/deploytarg deploytarg/dboard
-
 datashare-testing/sd : datashare.scm $(OFILES)
 	csc $(CSCOPTS) datashare.scm $(OFILES) -o datashare-testing/sd
 
 datashare-testing/sdat: sharedat.scm $(OFILES)
 	csc $(CSCOPTS) sharedat.scm $(OFILES) -o datashare-testing/sdat
@@ -442,45 +361,26 @@
 	rm  datashare-testing/sretrieve 
 	rm  datashare-testing/spublish
 
 sauth : sauth-init datashare-testing/sauthorize datashare-testing/sretrieve datashare-testing/spublish 
 
-readline-fix.scm :
-	if [[ $(shell chicken-status | grep readline | awk '{print $4}' | cut -d. -f1) -gt 3 ]];then \
-	   echo "(define *use-new-readline* #f)" > readline-fix.scm; \
-	else \
-	   echo "(define *use-new-readline* #t)" > readline-fix.scm;\
-	fi
-
 altdb.scm :
 	echo ";; optional alternate db setup" > altdb.scm
 	echo "(define *available-db* (make-hash-table))" >> altdb.scm
-	if  csi -ne '(use mysql-client)';then \
-           echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \
+	if  csi -ne '(import mysql-client)';then \
+           echo "(import mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \
 	fi
-	if csi -ne '(use postgresql)';then \
-	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
+	if csi -ne '(import postgresql)';then \
+	   echo "(import postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
 portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 
-# create a pdf dot graphviz diagram from notations in rmt.scm
-rmt.pdf : rmt.scm
-	grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf
-
 buildmanual:
 	cd docs/manual && make
 
-wikipage=plan
-editwiki:
-	cd docs/manual && ../../utils/editwiki $(wikipage)
-
-viewmanual:
-	arora docs/manual/megatest_manual.html
-
 targets:
 	@grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"'
-
 
 unit :
 	cd tests;make unit