@@ -9,10 +9,16 @@
 	   http-transport.scm filedb.scm \
            client.scm gutils.scm synchash.scm daemon.scm mt.scm dcommon.scm \
 	   tree.scm ezsteps.scm lock-queue.scm sdb.scm \
 	   rmt.scm api.scm tdb.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-tests.scm dashboard-guimonitor.scm 
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)
 
@@ -134,28 +140,30 @@
 $(DEPLOYHELPERS) : utils/mt_*
 	$(INSTALL) $< $@
 	chmod a+X $@
 
 deploytarg/apropos.so : Makefile
-	for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \
-	chicken-install -prefix deploytarg -deploy $$i;done
-
-deploytarg/libsqlite3.so : 
-	CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3
-
-deploy : deploytarg/megatest deploytarg/dashboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/nbfind deploytarg/libiupcd.so deploytarg/apropos.so
-
-deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so
-	for i in iup im cd av call sqlite; do \
-	  cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \
-	done
-	cp $(CKPATH)/include/*.h deploytarg
+	chicken-install -p deploytarg -deploy $(EGGS)
+
+#	for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \
+#	chicken-install -prefix deploytarg -deploy $$i;done
+
+# deploytarg/libsqlite3.so : 
+# 	CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3
+
+deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/nbfind deploytarg/apropos.so
+
+# deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so
+# 	for i in iup im cd av call sqlite; do \
+# 	  cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \
+# 	done
+# 	cp $(CKPATH)/include/*.h deploytarg
 
 # puts deployed megatest in directory "megatest"
-deploytarg/megatest : $(OFILES) megatest.o
-	csc -deploy $(CSCOPTS) $(OFILES) megatest.scm
-	rsync -av megatest/ deploytarg/
+deploytarg/mtest : $(OFILES) megatest.o deploytarg/apropos.so
+	csc -deploy $(CSCOPTS) $(OFILES) megatest.scm -o deploytarg
+	mv deploytarg/deploytarg deploytarg/mtest
 
-deploytarg/dashboard :  $(OFILES) $(GOFILES)
-	csc -deploy $(OFILES) $(GOFILES) dashboard.scm
-	rsync -av dashboard/ deploytarg/
+deploytarg/dboard :  $(OFILES) $(GOFILES) dashboard.scm deploytarg/apropos.so
+	csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg
+	mv deploytarg/deploytarg deploytarg/dboard