@@ -30,11 +30,12 @@
    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
+MSRCFILES = ftail.scm rmtmod.scm commonmod.scm
+
 
 # Eggs to install (straightforward ones)
 EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
 dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
 json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \
@@ -71,11 +72,11 @@
 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) mofiles/ftail.o mofiles/rmtmod.o
+mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
@@ -108,10 +109,11 @@
 	ods.o \
 	portlogger.o \
 	process.o \
 	rmt.o \
         mofiles/rmtmod.o \
+        mofiles/commonmod.o \
         rpc-transport.o \
 	runconfig.o \
 	runs.o \
 	server.o \
 	tasks.o \
@@ -160,10 +162,13 @@
 vg.o dashboard.o : vg_records.scm
 dcommon.o : run_records.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