@@ -32,21 +32,30 @@
 #   portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm 
 SRCFILES=
 
 # removed from MSRCFILES: ftail.scm
 # module source files
-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 megamod.scm
+
+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	\
+megamod.scm
 
 GMSRCFILES = dcommonmod.scm vgmod.scm treemod.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 \
-spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3
 
-GUISRCF  = dashboard-context-menu.scm dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm
+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		\
+spiffy-directory-listing ssax sxml-serializer sxml-modifications iup	\
+canvas-draw sqlite3
+
+GUISRCF = dashboard-context-menu.scm dashboard-tests.scm	\
+dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
@@ -85,15 +94,25 @@
 # 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 dcommonmod.import.o keysmod.import.o		\
+processmod.import.o servermod.import.o treemod.import.o			\
+clientmod.import.o envmod.import.o launchmod.import.o rmtmod.import.o	\
+subrunmod.import.o vgmod.import.o commonmod.import.o			\
+ezstepsmod.import.o megamod.import.o runconfigmod.import.o		\
+tasksmod.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)
+mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) $(IMPORTO)
 	csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)