@@ -24,16 +24,16 @@
 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 tdb.scm client.scm mt.scm	\
            ezsteps.scm lock-queue.scm rmt.scm api.scm		\
-           subrun.scm portlogger.scm archive.scm env.scm		\
+           subrun.scm archive.scm env.scm		\
            diff-report.scm cgisetup/models/pgdb.scm
 
 # module source files
 MSRCFILES = dbfile.scm debugprint.scm mtargs.scm commonmod.scm dbmod.scm \
-            tcp-transportmod.scm rmtmod.scm
+            tcp-transportmod.scm rmtmod.scm portlogger.scm
 
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
 transport-mode.scm : transport-mode.scm.template
 	cp transport-mode.scm.template transport-mode.scm
@@ -43,14 +43,21 @@
 
 megatest.scm : transport-mode.scm
 dashboard.scm : dashboard-transport-mode.scm
 
 # dbmod.import.o is just a hack here
-mofiles/dbfile.o     : mofiles/debugprint.o mofiles/commonmod.o dbmod.import.o
+mofiles/portlogger.o : mofiles/dbmod.o
+
+mofiles/dbfile.o     : \
+       mofiles/debugprint.o mofiles/commonmod.o
+
 configf.o : commonmod.import.o
-db.o : dbmod.import.o
+mofiles/dbfile.o : mofiles/debugprint.o
+mofiles/rmtmod.o mofiles/dbmod.o : mofiles/dbfile.o
+db.o : mofiles/dbmod.o mofiles/dbfile.o
 mofiles/debugprint.o : mofiles/mtargs.o
+mofiles/tcp-transportmod.o : mofiles/portlogger.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
@@ -74,12 +81,12 @@
 #	@[ -e mofiles ] || mkdir -p mofiles
 #	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o $*.o
 #	cp $*.o mofiles/$*.o
 #	@touch $*.import.scm # ensure it is touched after the .o is made
 
-mofiles/%.o : %.scm
-	mkdir -p mofiles
+%.import.scm mofiles/%.o : %.scm
+	@mkdir -p mofiles
 	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
 
 ADTLSCR=mt_laststep mt_runstep mt_ezstep
 HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR))
 DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR))
@@ -129,11 +136,10 @@
 	launch.o \
 	lock-queue.o \
 	margs.o \
 	mt.o \
 	ods.o \
-	portlogger.o \
 	process.o \
 	rmt.o \
 	runconfig.o \
 	runs.o \
 	server.o \
@@ -189,12 +195,13 @@
 
 runs.o : test_records.scm
 
 mofiles-made : $(MOFILES)
 	make $(MOIMPFILES)
+	touch mofiles-made
 
-megatest.o : mofiles-made megatest-fossil-hash.scm megatest-version.scm $(MOFILES) $(MOIMPFILES)
+megatest.o : megatest-fossil-hash.scm megatest-version.scm $(MOFILES) $(MOIMPFILES)
 
 rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.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