scheme: bin based on new ischeme

Makefile.am

@@ -43,15 +43,7 @@ EXTRA_DIST =
 #	ISSUES
 
 include $(top_srcdir)/klish/Makefile.am
-#include $(top_srcdir)/bin/Makefile.am
-
-#include $(top_srcdir)/tinyrl/module.am
-#include $(top_srcdir)/konf/module.am
-#include $(top_srcdir)/clish/module.am
-#include $(top_srcdir)/bin/module.am
-#include $(top_srcdir)/plugins/module.am
-#include $(top_srcdir)/libc/module.am
-#include $(top_srcdir)/doc/module.am
+include $(top_srcdir)/bin/Makefile.am
 
 define CONTROL
 PACKAGE: klish

bin/klishd/klishd.c

@@ -35,6 +35,7 @@
 #include <klish/ktp_session.h>
 
 #include <klish/kscheme.h>
+#include <klish/ischeme.h>
 
 #include "private.h"
 
@@ -136,14 +137,14 @@ int main(int argc, char **argv)
 	{
 	char *txt = NULL;
 	faux_error_t *error = faux_error_new();
-	scheme = kscheme_from_ischeme(&sch, error);
+	scheme = ischeme_load(&sch, error);
 	if (!scheme) {
 		fprintf(stderr, "Scheme errors:\n");
 		faux_error_show(error);
 		faux_error_free(error);
 		goto err;
 	}
-	txt = ischeme_to_text(&sch, 0);
+	txt = ischeme_deploy(scheme, 0);
 	printf("%s\n", txt);
 	faux_str_free(txt);
 	faux_error_free(error);