Move a bunch of files into calp module.

9 files changed, 16 insertions, 16 deletions

diff --git a/main b/main
index af2f489a..67e30973 100755
--- a/main
+++ b/main
@@ -6,4 +6,4 @@ here=$(dirname $(realpath $0))
 GUILE=${GUILE:-$(which guile)}
 # GUILE_LOAD_PATH=$here/module
 
-exec $GUILE -c '((@ (main) main) (command-line))' "$@"
+exec $GUILE -c '((@ (calp main) main) (command-line))' "$@"
diff --git a/module/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index fecc62f7..0814c44c 100644
--- a/module/entry-points/benchmark.scm
+++ b/module/calp/entry-points/benchmark.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points benchmark)
+(define-module (calp entry-points benchmark)
   :use-module (util)
 
   :use-module (ice-9 getopt-long)
diff --git a/module/entry-points/html.scm b/module/calp/entry-points/html.scm
index de80f8d2..7f7dc8a5 100644
--- a/module/entry-points/html.scm
+++ b/module/calp/entry-points/html.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points html)
+(define-module (calp entry-points html)
   :export (main)
   :use-module (util)
   :use-module (util time)
diff --git a/module/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 997621b2..3bf211df 100644
--- a/module/entry-points/ical.scm
+++ b/module/calp/entry-points/ical.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points ical)
+(define-module (calp entry-points ical)
   :export (main)
   :use-module (util)
   :use-module (util options)
diff --git a/module/entry-points/import.scm b/module/calp/entry-points/import.scm
index 956ccc91..b13832cc 100644
--- a/module/entry-points/import.scm
+++ b/module/calp/entry-points/import.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points import)
+(define-module (calp entry-points import)
   :export (main)
   :use-module (util)
   :use-module (util options)
diff --git a/module/entry-points/server.scm b/module/calp/entry-points/server.scm
index dfa94cc7..97397e5d 100644
--- a/module/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points server)
+(define-module (calp entry-points server)
   :use-module (util)
   :use-module (util options)
   :use-module (util exceptions)
diff --git a/module/entry-points/terminal.scm b/module/calp/entry-points/terminal.scm
index d44fb1e8..5a9b2588 100644
--- a/module/entry-points/terminal.scm
+++ b/module/calp/entry-points/terminal.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points terminal)
+(define-module (calp entry-points terminal)
   :export (main)
   :use-module (output terminal)
   :use-module (vcomponent)
diff --git a/module/entry-points/text.scm b/module/calp/entry-points/text.scm
index d6ebd72e..04f57a31 100644
--- a/module/entry-points/text.scm
+++ b/module/calp/entry-points/text.scm
@@ -1,4 +1,4 @@
-(define-module (entry-points text)
+(define-module (calp entry-points text)
   :export (main)
   :use-module (text flow)
   :use-module (ice-9 getopt-long)
diff --git a/module/main.scm b/module/calp/main.scm
index 4d3e01a6..2e08fd0f 100644
--- a/module/main.scm
+++ b/module/calp/main.scm
@@ -1,5 +1,5 @@
 ;; -*- geiser-scheme-implementation: guile -*-
-(define-module (main)
+(define-module (calp main)
   :use-module (util)
 
   :use-module (srfi srfi-1)
@@ -174,13 +174,13 @@
   (let ((ropt (ornull (option-ref opts '() '())
                       '("term"))))
     ((case (string->symbol (car ropt))
-       ((html)   (@ (entry-points     html) main))
-       ((term)   (@ (entry-points terminal) main))
-       ((import) (@ (entry-points   import) main))
-       ((text)   (@ (entry-points     text) main))
-       ((ical)   (@ (entry-points     ical) main))
-       ((server) (@ (entry-points   server) main))
-       ((benchmark) (@ (entry-points benchmark) main))
+       ((html)   (@ (calp entry-points     html) main))
+       ((term)   (@ (calp entry-points terminal) main))
+       ((import) (@ (calp entry-points   import) main))
+       ((text)   (@ (calp entry-points     text) main))
+       ((ical)   (@ (calp entry-points     ical) main))
+       ((server) (@ (calp entry-points   server) main))
+       ((benchmark) (@ (calp entry-points benchmark) main))
        (else => (lambda (s)
                   (format (current-error-port)
                           "Unsupported mode of operation: ~a~%"