@@ -29,13 +29,18 @@
            subrun.scm portlogger.scm archive.scm env.scm		\
            diff-report.scm pgdb.scm
 
 #  cgisetup/models/pgdb.scm
 
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
+
 # module source files
 MSRCFILES = dbmod.scm dbfile.scm debugprint.scm mtargs.scm commonmod.scm \
            ducttape-lib.scm pkts.scm dbi.scm autoload.scm stml2.scm
+# dbmod.import.o is just a hack here
+mofiles/dbfile.o     : mofiles/debugprint.o dbmod.import.o
+mofiles/debugprint.o : mofiles/mtargs.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
@@ -91,12 +96,10 @@
 ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 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) $(MOIMPFILES)  megatest-version.scm
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
 
 showmtesthash:
@@ -168,11 +171,12 @@
 mofiles/dbi.o        : mofiles/autoload.o
 mofiles/pkts.o       : mofiles/dbi.o
 mofiles/dbfile.o     : mofiles/debugprint.o
 mofiles/debugprint.o : mofiles/mtargs.o
 
-common.o : mofiles/commonmod.o megatest-fossil-hash.scm
+mofiles/commonmod.o : megatest-fossil-hash.scm
+common.o : mofiles/commonmod.o
 
 # mofiles/dbmod.o : mofiles/configfmod.o
 
 # commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm