@@ -30,11 +30,11 @@
 MSRCFILES = dbmod.scm rmtmod.scm commonmod.scm apimod.scm		\
 archivemod.scm clientmod.scm envmod.scm ezstepsmod.scm itemsmod.scm	\
 keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm	\
 runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm	\
 pkts.scm mtargs.scm mtconfigf.scm ducttape-lib.scm ulex.scm		\
-megamod.scm
+stml2.scm cookie.scm megamod.scm
 
 GMSRCFILES = dcommonmod.scm vgmod.scm treemod.scm
 
 # Eggs to install (straightforward ones)
 
@@ -65,11 +65,11 @@
 # mofiles/ducttape-lib.o : ducttape-lib.scm ducttape/*scm
 #	csc -I ducttape -J -c ducttape-lib.scm -o mofiles/ducttape-lib.o
 
 mofiles/%.o %.import.scm : %.scm
 	mkdir -p mofiles
-	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o
+	csc $(CSCOPTS) -I $* -J -c $< -o mofiles/$*.o
 	touch $*.import.scm # ensure it is touched after the .o is made
 
 # a.import.o : a.import.scm a.o
 # csc -unit a.import -c a.import.scm -o $*.o
 
@@ -90,20 +90,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
-
-# IMPORTO = apimod.import.o dbmod.import.o itemsmod.import.o	\
-# odsmod.import.o runsmod.import.o testsmod.import.o		\
-# archivemod.import.o keysmod.import.o processmod.import.o	\
-# servermod.import.o clientmod.import.o envmod.import.o		\
-# launchmod.import.o rmtmod.import.o subrunmod.import.o		\
-# commonmod.import.o ezstepsmod.import.o megamod.import.o		\
-# runconfigmod.import.o tasksmod.import.o pkts.import.o
-
 all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt
 
 # why were the files  mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o listed on this target when MOFILES are there?
 # Removed non module .o files (i.e. $(OFILES)
 mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) mofiles/ducttape-lib.o
@@ -120,41 +110,10 @@
 	csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard
 
 mtut:  $(MOFILES) megatest-fossil-hash.scm mtut.scm
 	csc $(CSCOPTS) $(MOFILES) mtut.scm -o mtut
 
-
-#TCMTOBJS = \
-#	api.o \
-#	archive.o \
-#	cgisetup/models/pgdb.o \
-#	client.o \
-#	common.o \
-#	configf.o \
-#	db.o \
-#	env.o \
-#	http-transport.o \
-#	items.o \
-#	keys.o \
-#	launch.o \
-#	lock-queue.o \
-#	margs.o \
-#	mt.o \
-#	megatest-version.o \
-#	ods.o \
-#	portlogger.o \
-#	process.o \
-#	rmt.o \
-#        $(MOFILES) \
-#        rpc-transport.o \
-#	runconfig.o \
-#	runs.o \
-#	server.o \
-#	tasks.o \
-#	tdb.o \
-#	tests.o \
-#	subrun.o \
 TCMTOBJS=
 
 tcmt : $(TCMTOBJS) $(MOFILES) tcmt.scm
 	csc $(CSCOPTS) $(MOFILES) $(TCMTOBJS) tcmt.scm -o tcmt
 
@@ -203,25 +162,23 @@
 
 common_records.scm : altdb.scm
 
 vg.o dashboard.o : vg_records.scm mofiles/dcommonmod.o
 
-dcommon.o : run_records.scm migrate-fix.scm
+dcommon.o : run_records.scm migrate-fix.scm mofiles/stml2.o
+
+mofiles/stml2.o : mofiles/cookie.o
 
 # special include based modules
 mofiles/pkts.o : pkts/pkts.scm
 mofiles/mtargs.o : mtargs/mtargs.scm
 mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm
 mofiles/ulex.o : ulex/ulex.scm
-# mofile/ducttape-lib.o : ducttape/ducttape-lib.scm
-
-# Temporary while transitioning to new routine
-# runs.o : run-tests-queue-classic.scm  run-tests-queue-new.scm
 
 # for the modularized stuff
 
-mofiles/commonmod.o : megatest-fossil-hash.scm
+mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o
 mofiles/dbmod.o     : mofiles/commonmod.o mofiles/keysmod.o \
                       mofiles/tasksmod.o mofiles/odsmod.o
 mofiles/commonmod.o : mofiles/processmod.o
 mofiles/rmtmod.o    : mofiles/dbmod.o mofiles/commonmod.o \
                       mofiles/apimod.o mofiles/ulex.o
@@ -251,10 +208,11 @@
    mofiles/testsmod.o \
    mofiles/pkts.o \
    mofiles/mtargs.o \
    mofiles/mtconfigf.o \
    mofiles/ducttape-lib.o \
+   mofiles/stml2.o \
    *-inc.scm
 
 mofiles/dcommonmod.o : \
    mofiles/vgmod.o \
    mofiles/treemod.o \