46 files changed, 13 insertions, 7 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ce7b5b4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+CSC := guile-compat/csc.fish
+
+.PHONY: test-csc
+test: *.csc
+	$(CSC) tests/test-main.csc lib/csc/*-test.csc
+
+.PHONY: test
+test: test-csc
diff --git a/csc/main.csc b/csc.csc
index 9dae75f..9dae75f 100644
--- a/csc/main.csc
+++ b/csc.csc
diff --git a/csc/Makefile b/csc/Makefile
deleted file mode 100644
index d4f1ab6..0000000
--- a/csc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-CSC := guile-compat/csc.fish
-
-.PHONY: test
-test: *.csc
-	$(CSC) test-main.csc *-test.csc
diff --git a/csc/guile-compat/lib/csc b/csc/guile-compat/lib/csc
deleted file mode 120000
index c25bddb..0000000
--- a/csc/guile-compat/lib/csc
+++ /dev/null
@@ -1 +0,0 @@
-../..
\ No newline at end of file
diff --git a/csc/guile-compat/compat.scm b/guile-compat/compat.scm
index 5997267..5997267 100644
--- a/csc/guile-compat/compat.scm
+++ b/guile-compat/compat.scm
diff --git a/csc/guile-compat/csc.fish b/guile-compat/csc.fish
index ffda4d2..ffda4d2 100755
--- a/csc/guile-compat/csc.fish
+++ b/guile-compat/csc.fish
diff --git a/guile-compat/lib/csc b/guile-compat/lib/csc
new file mode 120000
index 0000000..c8a0323
--- /dev/null
+++ b/guile-compat/lib/csc
@@ -0,0 +1 @@
+../../lib/csc
\ No newline at end of file
diff --git a/csc/assert-test.csc b/lib/csc/assert-test.csc
index 4e8d2d3..4e8d2d3 100644
--- a/csc/assert-test.csc
+++ b/lib/csc/assert-test.csc
diff --git a/csc/assert.csc b/lib/csc/assert.csc
index 84d2096..84d2096 100644
--- a/csc/assert.csc
+++ b/lib/csc/assert.csc
diff --git a/csc/codegen-test.csc b/lib/csc/codegen-test.csc
index 29d1da5..29d1da5 100644
--- a/csc/codegen-test.csc
+++ b/lib/csc/codegen-test.csc
diff --git a/csc/codegen.csc b/lib/csc/codegen.csc
index ac5b313..ac5b313 100644
--- a/csc/codegen.csc
+++ b/lib/csc/codegen.csc
diff --git a/csc/compare-test.csc b/lib/csc/compare-test.csc
index b710115..b710115 100644
--- a/csc/compare-test.csc
+++ b/lib/csc/compare-test.csc
diff --git a/csc/compare.csc b/lib/csc/compare.csc
index e8e68d3..e8e68d3 100644
--- a/csc/compare.csc
+++ b/lib/csc/compare.csc
diff --git a/csc/compiler.csc b/lib/csc/compiler.csc
index 20d5d37..20d5d37 100644
--- a/csc/compiler.csc
+++ b/lib/csc/compiler.csc
diff --git a/csc/config.csc b/lib/csc/config.csc
index d2618a7..d2618a7 100644
--- a/csc/config.csc
+++ b/lib/csc/config.csc
diff --git a/csc/cps-test.csc b/lib/csc/cps-test.csc
index 156ba60..156ba60 100644
--- a/csc/cps-test.csc
+++ b/lib/csc/cps-test.csc
diff --git a/csc/cps.csc b/lib/csc/cps.csc
index f2a9c90..f2a9c90 100644
--- a/csc/cps.csc
+++ b/lib/csc/cps.csc
diff --git a/csc/encoding-test.csc b/lib/csc/encoding-test.csc
index 6b28d8e..6b28d8e 100644
--- a/csc/encoding-test.csc
+++ b/lib/csc/encoding-test.csc
diff --git a/csc/encoding.csc b/lib/csc/encoding.csc
index 9afa40f..9afa40f 100644
--- a/csc/encoding.csc
+++ b/lib/csc/encoding.csc
diff --git a/csc/flag.csc b/lib/csc/flag.csc
index c0a28a8..c0a28a8 100644
--- a/csc/flag.csc
+++ b/lib/csc/flag.csc
diff --git a/csc/format-test.csc b/lib/csc/format-test.csc
index 1906af6..1906af6 100644
--- a/csc/format-test.csc
+++ b/lib/csc/format-test.csc
diff --git a/csc/format.csc b/lib/csc/format.csc
index 6ffd736..6ffd736 100644
--- a/csc/format.csc
+++ b/lib/csc/format.csc
diff --git a/csc/gensym.csc b/lib/csc/gensym.csc
index 480cbc2..480cbc2 100644
--- a/csc/gensym.csc
+++ b/lib/csc/gensym.csc
diff --git a/csc/hash-map-test.csc b/lib/csc/hash-map-test.csc
index 6f83c30..6f83c30 100644
--- a/csc/hash-map-test.csc
+++ b/lib/csc/hash-map-test.csc
diff --git a/csc/hash-map.csc b/lib/csc/hash-map.csc
index 682fa30..682fa30 100644
--- a/csc/hash-map.csc
+++ b/lib/csc/hash-map.csc
diff --git a/csc/ir1.csc b/lib/csc/ir1.csc
index b91e8ab..b91e8ab 100644
--- a/csc/ir1.csc
+++ b/lib/csc/ir1.csc
diff --git a/csc/ir2.csc b/lib/csc/ir2.csc
index 888437f..888437f 100644
--- a/csc/ir2.csc
+++ b/lib/csc/ir2.csc
diff --git a/csc/linker-test.csc b/lib/csc/linker-test.csc
index adbcf91..adbcf91 100644
--- a/csc/linker-test.csc
+++ b/lib/csc/linker-test.csc
diff --git a/csc/linker.csc b/lib/csc/linker.csc
index 5e4e678..5e4e678 100644
--- a/csc/linker.csc
+++ b/lib/csc/linker.csc
diff --git a/csc/list-test.csc b/lib/csc/list-test.csc
index dd5d640..dd5d640 100644
--- a/csc/list-test.csc
+++ b/lib/csc/list-test.csc
diff --git a/csc/list.csc b/lib/csc/list.csc
index b1c2298..b1c2298 100644
--- a/csc/list.csc
+++ b/lib/csc/list.csc
diff --git a/csc/loop-test.csc b/lib/csc/loop-test.csc
index 50090e0..50090e0 100644
--- a/csc/loop-test.csc
+++ b/lib/csc/loop-test.csc
diff --git a/csc/loop.csc b/lib/csc/loop.csc
index f07deae..f07deae 100644
--- a/csc/loop.csc
+++ b/lib/csc/loop.csc
diff --git a/csc/macros-test.csc b/lib/csc/macros-test.csc
index 531e3e2..531e3e2 100644
--- a/csc/macros-test.csc
+++ b/lib/csc/macros-test.csc
diff --git a/csc/macros.csc b/lib/csc/macros.csc
index 4559991..4559991 100644
--- a/csc/macros.csc
+++ b/lib/csc/macros.csc
diff --git a/csc/match-test.csc b/lib/csc/match-test.csc
index c5923e4..c5923e4 100644
--- a/csc/match-test.csc
+++ b/lib/csc/match-test.csc
diff --git a/csc/match.csc b/lib/csc/match.csc
index 4db0d07..4db0d07 100644
--- a/csc/match.csc
+++ b/lib/csc/match.csc
diff --git a/csc/sort-test.csc b/lib/csc/sort-test.csc
index 9c91d4a..9c91d4a 100644
--- a/csc/sort-test.csc
+++ b/lib/csc/sort-test.csc
diff --git a/csc/sort.csc b/lib/csc/sort.csc
index 6be1e16..6be1e16 100644
--- a/csc/sort.csc
+++ b/lib/csc/sort.csc
diff --git a/csc/strings-test.csc b/lib/csc/strings-test.csc
index 1f981ad..1f981ad 100644
--- a/csc/strings-test.csc
+++ b/lib/csc/strings-test.csc
diff --git a/csc/strings.csc b/lib/csc/strings.csc
index 255a2fd..255a2fd 100644
--- a/csc/strings.csc
+++ b/lib/csc/strings.csc
diff --git a/csc/testing.csc b/lib/csc/testing.csc
index 68678ca..68678ca 100644
--- a/csc/testing.csc
+++ b/lib/csc/testing.csc
diff --git a/csc/vec-test.csc b/lib/csc/vec-test.csc
index 761b259..761b259 100644
--- a/csc/vec-test.csc
+++ b/lib/csc/vec-test.csc
diff --git a/csc/vec.csc b/lib/csc/vec.csc
index 2730c39..2730c39 100644
--- a/csc/vec.csc
+++ b/lib/csc/vec.csc
diff --git a/csc/shell.nix b/shell.nix
index 7e67a41..7e67a41 100644
--- a/csc/shell.nix
+++ b/shell.nix
diff --git a/csc/test-main.csc b/tests/test-main.csc
index 184d069..c10c882 100644
--- a/csc/test-main.csc
+++ b/tests/test-main.csc
@@ -6,7 +6,10 @@
 
 
 (define (filename->library f)
-  (list 'csc (string->symbol (substring f 0 (- (string-length f) 4)))))
+  (call-with-input-file f
+    (lambda (p)
+      ; (define-library <name> ...
+      (cadr (read p)))))
 
 
 ; Guile's load function allows import forms, but by a strict reading of R7RS,