@@ -28,14 +28,14 @@
            ezsteps.scm lock-queue.scm rmt.scm api.scm		\
            subrun.scm portlogger.scm archive.scm env.scm		\
            diff-report.scm cgisetup/models/pgdb.scm
 
 # module source files
-MSRCFILES = dbmod.scm dbfile.scm debugprint.scm mtargs.scm
+MSRCFILES = dbmod.scm dbfile.scm debugprint.scm mtargs.scm commonmod.scm
 
-mofiles/dbfile.o     : mofiles/debugprint.o
-mofiles/debugprint.o : mofiles/mtargs.o
+mofiles/dbfile.o     : mofiles/debugprint.o mofiles/commonmod.o commonmod.import.o
+mofiles/debugprint.o : mofiles/mtargs.o mofiles/commonmod.o commonmod.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
@@ -49,23 +49,28 @@
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 # compiled import files
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
-%.import.o : %.import.scm
-	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o
+# %.import.o : %.import.scm 
+#	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o
+
+# %.import.scm : mofiles/%.o
+#	sleep 0.1
 
 # I'm not sure the cp is a good idea, changed a lot of things and it may not have been necessary...
 # mofiles/%.o  %.import.scm : %.scm megatest-fossil-hash.scm
 #	@[ -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
+mofiles/%.o %.import.o : %.scm megatest-fossil-hash.scm
 	mkdir -p mofiles
-	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
+	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o # $(shell ls *.o mofiles/*.o)
+	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o # $(shell ls *.o mofiles/*.o)
+	@touch $*.import.scm # ensure it is younger than the .o
 
 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}')
@@ -210,11 +215,11 @@
 	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)
+	csc $(CSCOPTS) -c $< $(MOFILES) $(MOIMPFILES)
 
 $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper
 	@echo Installing to PREFIX=$(PREFIX)
 	$(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest
 	utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest