@@ -20,21 +20,22 @@
 SHELL=/bin/bash
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
 SRCFILES = common.scm items.scm launch.scm runconfig.scm	\
-           server.scm configf.scm db.scm margs.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	\
            ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm		\
            subrun.scm archive.scm env.scm		\
-           diff-report.scm cgisetup/models/pgdb.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 
+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
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
+
 # ftail.scm rmtmod.scm commonmod.scm removed
 # MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm	\
 #             mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm	\
 #             rmtmod.scm apimod.scm
 
@@ -112,18 +113,16 @@
 	env.o \
 	http-transport.o \
 	items.o \
 	launch.o \
 	lock-queue.o \
-	margs.o \
 	mt.o \
 	process.o \
 	rmt.o \
 	runconfig.o \
 	runs.o \
 	server.o \
-	tasks.o \
 	tdb.o \
 	tests.o \
 	subrun.o \
         ezsteps.o
 
@@ -189,11 +188,11 @@
 # # 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				\
+# 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
@@ -200,11 +199,11 @@
 
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o  : run_records.scm
 
 db.o ezsteps.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
+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
@@ -461,18 +460,18 @@
 
 xterm : sd
 	(export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &)
 
 datashare-testing/spublish : spublish.scm $(OFILES) megatest-version.scm
-	csc $(CSCOPTS) spublish.scm margs.o process.o common.o  -o datashare-testing/spublish
+	csc $(CSCOPTS) spublish.scm mofiles/margsmod.o process.o common.o  -o datashare-testing/spublish
 
 datashare-testing/sretrieve : sretrieve.scm $(OFILES) megatest-version.scm
-	csc $(CSCOPTS) sretrieve.scm margs.o process.o common.o  -o datashare-testing/sretrieve
+	csc $(CSCOPTS) sretrieve.scm mofiles/margsmod.o process.o common.o  -o datashare-testing/sretrieve
 
 
 datashare-testing/sauthorize : sauthorize.scm $(OFILES) megatest-version.scm
-	 csc $(CSCOPTS) sauthorize.scm margs.o process.o common.o  -o datashare-testing/sauthorize
+	 csc $(CSCOPTS) sauthorize.scm mofiles/margsmod.o process.o common.o  -o datashare-testing/sauthorize
 
 sauth-init:
 	mkdir -p  datashare-testing
 	rm  datashare-testing/sauthorize
 	rm  datashare-testing/sretrieve 
@@ -495,12 +494,12 @@
 	fi
 	if csi -ne '(use postgresql)';then \
 	   echo "(use 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 launch.o lock-queue.o margs.o mt.o mofiles/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 launch.o lock-queue.o margs.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+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 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
+	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
 
 # 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