@@ -19,22 +19,23 @@
 # rm <files>.o ; make install CSCOPTS='-profile' ; ... ;  chicken-profile | less
 SHELL=/bin/bash
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
-SRCFILES = common.scm items.scm launch.scm runconfig.scm	\
+SRCFILES = common.scm launch.scm runconfig.scm	\
            server.scm configf.scm db.scm		\
            process.scm runs.scm tests.scm genexample.scm	\
-           http-transport.scm filedb.scm tdb.scm mt.scm	\
+           http-transport.scm filedb.scm mt.scm	\
            ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm		\
            subrun.scm archive.scm env.scm		\
            diff-report.scm
 
 # module source files
 MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm \
             ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm \
-            pgdb.scm margsmod.scm debugprint.scm client.scm
+            pgdb.scm margsmod.scm debugprint.scm client.scm items.scm \
+            tdb.scm
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
 # ftail.scm rmtmod.scm commonmod.scm removed
@@ -85,14 +86,14 @@
 # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
 ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
 
 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
+	@echo "Suggestion: run make build.pdf to regenerate dependencies"
 	csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
 
 showmtesthash:
 	@echo $(MTESTHASH)
 
@@ -106,27 +107,23 @@
 # include makefile.inc
 
 TCMTOBJS = \
 	api.o \
 	archive.o \
-	cgisetup/models/pgdb.o \
-	client.o \
 	common.o \
 	configf.o \
 	db.o \
 	env.o \
 	http-transport.o \
-	items.o \
 	launch.o \
 	lock-queue.o \
 	mt.o \
 	process.o \
 	rmt.o \
 	runconfig.o \
 	runs.o \
 	server.o \
-	tdb.o \
 	tests.o \
 	subrun.o \
         ezsteps.o
 
 # 	 ods.o \
@@ -445,12 +442,14 @@
 	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o mofiles/margsmod.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o mofiles/tasks.o tdb.o tests.o tree.o
 
 %.pdf : %.dot
 	dot -Tpdf $*.dot -o $*.pdf
 
-all.dot all-inc.dot : *.scm cgisetup/models/pgdb.scm
-	gendeps all *.scm 
+build.dot build-inc.dot : *.scm cgisetup/models/pgdb.scm
+	gendeps build *.scm 
+
+# build.inc : build.dot
 
 buildmanual:
 	cd docs/manual && make
 
 wikipage=plan