@@ -22,19 +22,19 @@
 CSCOPTS=
 INSTALL=install
 SRCFILES = common.scm items.scm launch.scm runconfig.scm	\
            server.scm configf.scm db.scm		\
            process.scm runs.scm tests.scm genexample.scm	\
-           http-transport.scm filedb.scm tdb.scm client.scm mt.scm	\
+           http-transport.scm filedb.scm tdb.scm mt.scm	\
            ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm		\
            subrun.scm archive.scm env.scm		\
            diff-report.scm
 
 # module source files
 MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm \
             ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm \
-            pgdb.scm margsmod.scm debugprint.scm
+            pgdb.scm margsmod.scm debugprint.scm client.scm
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
 # ftail.scm rmtmod.scm commonmod.scm removed
@@ -156,46 +156,10 @@
 # Include the generated dependency file
 include build.inc
 
 # Special dependencies for the module includes
 $(OFILES) $(MOFILES) $(MOIMPFILES) : megatest-fossil-hash.scm
-# we are going to generate this by running make without -j
-# and only adding the needed deps. The full deps have too many
-# circular deps and can not (yet) be resolved.
-
-## 
-## mofiles/dcommonmod.o mofiles/configfmod.o mofiles/ods.o mofiles/apimod.o mofiles/rmtmod.o mofiles/dbmod.o : \
-##       mofiles/commonmod.o
-## 
-## mofiles/dbmod.o : mofiles/ods.o
-## mofiles/dbmod.o : mofiles/configfmod.o
-## mofiles/servermod.o mofiles/rmtmod.o : mofiles/dbmod.o
-## 
-## dcommon.o : mofiles/dcommonmod.o
-## 
-
-# megatest.o : $(MOIMPFILES)
-# mofiles/commonmod.o : megatest-fossil-hash.scm
-# mofiles/dbmod.o \
-#       mofiles/servermod.o \
-#       mofiles/apimod.o \
-#       mofiles/dcommonmod.o \
-#       mofiles/ods.o : mofiles/commonmod.o mofiles/configfmod.o
-# 
-# mofiles/dcommonmod.o : mofiles/configfmod.o mofiles/dbmod.o
-# mofiles/configfmod.o : mofiles/commonmod.o
-# # mofiles/dbmod.o      : mofiles/configfmod.o
-# mofiles/rmtmod.o : mofiles/apimod.o
-# # mofiles/servermod.o : mofiles/dbmod.o
-# common.o : mofiles/commonmod.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				\
-# # 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
 
 # dashboard.o : mofiles/apimod.o
@@ -205,42 +169,20 @@
 db.o ezsteps.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
 
 tests.o mofiles/tasks.o dashboard-tasks.o : task_records.scm
 
 runs.o : test_records.scm
-# api.o rmt.o db.o : mofiles/apimod.o mofiles/dbmod.o mofiles/rmtmod.o mofiles/ods.o
 
 mofiles/commonmod.o common.o megatest.o dashboard.o : megatest-fossil-hash.scm megatest-version.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/dcommonmod.o
 
 mofiles/stml2.o  : mofiles/cookie.o
-# mofiles/dbmod.o  : mofiles/ods.o
-# mofiles/rmtmod.o : mofiles/dbmod.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
@@ -503,12 +445,12 @@
 	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 launch.o lock-queue.o mofiles/margsmod.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o mofiles/tasks.o tdb.o tests.o tree.o
 
 %.pdf : %.dot
 	dot -Tpdf $*.dot -o $*.pdf
 
-all.dot all-inc.dot : *.scm
-	gendeps all *.scm
+all.dot all-inc.dot : *.scm cgisetup/models/pgdb.scm
+	gendeps all *.scm 
 
 buildmanual:
 	cd docs/manual && make
 
 wikipage=plan