Relocated scm files into corresponding sld directories

Makefile

@@ -15,13 +15,13 @@ scheme/base.o: cyclone scheme/base.sld
 scheme/char.o: cyclone scheme/char.sld
 	./cyclone scheme/char.sld
 
-scheme/eval.o: cyclone scheme/eval.sld eval.scm
+scheme/eval.o: cyclone scheme/eval.sld scheme/eval.scm
 	./cyclone scheme/eval.sld
 
 scheme/file.o: cyclone scheme/file.sld
 	./cyclone scheme/file.sld
 
-scheme/read.o: cyclone scheme/read.sld parser.scm
+scheme/read.o: cyclone scheme/read.sld scheme/parser.scm
 	./cyclone scheme/read.sld
 
 scheme/write.o: cyclone scheme/write.sld
@@ -33,23 +33,23 @@ scheme/cyclone/common.o: scheme/cyclone/common.sld
 scheme/cyclone/util.o: scheme/cyclone/util.sld
 	./cyclone scheme/cyclone/util.sld
 
-common.so: scheme/cyclone/common.scm
+scheme/cyclone/common.so: scheme/cyclone/common.scm
 	csc -s scheme/cyclone/common.scm
 
-util.so: util.scm
-	csc -s util.scm
+scheme/cyclone/util.so: scheme/cyclone/util.scm
+	csc -s scheme/cyclone/util.scm
 
-transforms.so: transforms.scm
-	csc -s transforms.scm
+scheme/cyclone/transforms.so: scheme/cyclone/transforms.scm
+	csc -s scheme/cyclone/transforms.scm
 
-cgen.so: cgen.scm
-	csc -s cgen.scm
+scheme/cyclone/cgen.so: scheme/cyclone/cgen.scm
+	csc -s scheme/cyclone/cgen.scm
 
-libraries.so: libraries.scm
-	csc -s libraries.scm
+scheme/cyclone/libraries.so: scheme/cyclone/libraries.scm
+	csc -s scheme/cyclone/libraries.scm
 
-parser.so: parser.scm
-	csc -s parser.scm
+scheme/cyclone/parser.so: scheme/parser.scm
+	csc -s scheme/parser.scm
 
 libcyclone.so.1: runtime.c include/cyclone/runtime.h
 	gcc -g -c -fPIC runtime.c -o runtime.o
@@ -72,7 +72,7 @@ debug:
 debug2: libcyclone.so.1
 	gcc test.c -L. -lcyclone -I. -g -o test
 
-cyclone: cyclone.scm transforms.so util.so cgen.so libraries.so parser.so common.so libcyclone.a
+cyclone: cyclone.scm scheme/cyclone/transforms.so scheme/cyclone/util.so scheme/cyclone/cgen.so scheme/cyclone/libraries.so scheme/cyclone/parser.so scheme/cyclone/common.so libcyclone.a
 	csc cyclone.scm
 
 #scheme/cyclone/util.o: cyclone scheme/cyclone/util.sld
@@ -162,7 +162,7 @@ test2: examples/hello-library/int-test/hello.c libcyclone.a
 ## END temporary directives
 ###########################
 
-icyc: cyclone icyc.scm eval.scm libraries.scm parser.scm include/cyclone/runtime.h scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o scheme/cyclone/util.o scheme/cyclone/common.o scheme/cyclone/util.o
+icyc: cyclone icyc.scm scheme/eval.scm scheme/cyclone/libraries.scm scheme/parser.scm include/cyclone/runtime.h scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o scheme/cyclone/util.o scheme/cyclone/common.o scheme/cyclone/util.o
 	./cyclone icyc.scm
 
 .PHONY: tags
@@ -186,6 +186,7 @@ install:
 	$(INSTALL) -m0644 include/cyclone/*.h $(DESTDIR)$(INCDIR)/
 	$(INSTALL) -m0644 scheme/*.sld $(DESTDIR)$(DATADIR)/scheme
 	$(INSTALL) -m0644 scheme/*.o $(DESTDIR)$(DATADIR)/scheme
+	$(INSTALL) -m0644 scheme/cyclone/*.scm $(DESTDIR)$(DATADIR)/scheme/cyclone
 	$(INSTALL) -m0644 scheme/cyclone/*.sld $(DESTDIR)$(DATADIR)/scheme/cyclone
 	$(INSTALL) -m0644 scheme/cyclone/*.o $(DESTDIR)$(DATADIR)/scheme/cyclone
 

cyclone.scm

@@ -27,11 +27,11 @@
    (require-extension chicken-syntax) ;; when
    (require-extension srfi-1) ;; every
    (load (string-append (Cyc-installation-dir) "/scheme/cyclone/common.so"))
-   (load (string-append (Cyc-installation-dir) "/parser.so"))
-   (load (string-append (Cyc-installation-dir) "/util.so"))
-   (load (string-append (Cyc-installation-dir) "/libraries.so"))
-   (load (string-append (Cyc-installation-dir) "/transforms.so"))
-   (load (string-append (Cyc-installation-dir) "/cgen.so")))
+   (load (string-append (Cyc-installation-dir) "/scheme/parser.so"))
+   (load (string-append (Cyc-installation-dir) "/scheme/cyclone/util.so"))
+   (load (string-append (Cyc-installation-dir) "/scheme/cyclone/libraries.so"))
+   (load (string-append (Cyc-installation-dir) "/scheme/cyclone/transforms.so"))
+   (load (string-append (Cyc-installation-dir) "/scheme/cyclone/cgen.so")))
  (else #f))
 
 ;; Code emission.

scheme/cyclone/cgen.sld

@@ -74,4 +74,4 @@
     ;(c-compile-formals formals type)
     ;(c-compile-lambda exp)
   )
-  (include "../../cgen.scm"))
+  (include "cgen.scm"))

scheme/cyclone/libraries.sld

@@ -21,7 +21,7 @@
     lib:get-all-import-deps
     lib:get-dep-list
   )
-  (include "../../libraries.scm")
+  (include "libraries.scm")
   ;(begin
   ;  (define read cyc-read))
 )

scheme/cyclone/transforms.sld

@@ -119,5 +119,5 @@
     pos-in-list 
     closure-convert 
   )
-  (include "../../transforms.scm"))
+  (include "transforms.scm"))
 

scheme/cyclone/util.sld

@@ -18,7 +18,7 @@
     any
     every
     filter)
-  (include "../../util.scm")
+  (include "util.scm")
   (begin
     ;; Simplified versions of every/any from SRFI-1
     (define (any pred lst)

scheme/eval.sld

@@ -8,5 +8,5 @@
   (export
     eval
   )
-  (include "../eval.scm")
+  (include "eval.scm")
   (begin))

scheme/read.sld

@@ -5,6 +5,6 @@
     read
     read-all
   )
-  (include "../parser.scm")
+  (include "parser.scm")
   (begin
     (define read cyc-read)))