X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=cl-graph.asd;h=d0e14b5db5d37899d471dfc0a8cec8c80988b409;hb=9caae8213191b49474654a15d4c69cfec459c2e5;hp=3bad4089152981dc94aa5aab937ecbc9bd33b338;hpb=438d1e0593dc62fe7b975a5865ec27955afcb7a1;p=cl-graph.git

diff --git a/cl-graph.asd b/cl-graph.asd
index 3bad408..d0e14b5 100644
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -5,13 +5,13 @@
 |#
 
 (in-package :common-lisp-user)
-(defpackage "ASDF-CL-GRAPH" (:use #:cl #:asdf))
-(in-package "ASDF-CL-GRAPH")
+(defpackage #:asdf-cl-graph (:use #:cl #:asdf))
+(in-package #:asdf-cl-graph)
 
 (unless (find-system 'asdf-system-connections nil)
  (when (find-package 'asdf-install)
    (print "Trying to install asdf-system-connections with ASDF-Install...")
-   (funcall (intern "INSTALL" "ASDF-INSTALL") 'asdf-system-connections)))
+   (funcall (intern (symbol-name :install) :asdf-install) 'asdf-system-connections)))
 ;; give up with a useful (?) error message
 (unless (find-system 'asdf-system-connections nil)
   (error "The CL-Graph system requires ASDF-SYSTEM-CONNECTIONS. See 
@@ -20,7 +20,7 @@ instructions."))
 
 (asdf:operate 'asdf:load-op 'asdf-system-connections)
 
-(defsystem cl-graph 
+(defsystem cl-graph
   :version "0.8"
   :author "Gary Warren King <gwking@metabang.com>"
   :maintainer "Gary Warren King <gwking@metabang.com>"
@@ -33,7 +33,7 @@ instructions."))
                                      (:file "macros"
                                             :depends-on ("package"))
                                      (:file "graph"
-                                            :depends-on ("api"))
+                                            :depends-on ("api" "macros"))
                                      (:file "graph-container"
                                             :depends-on ("graph"))
                                      (:file "graph-matrix"
@@ -42,10 +42,11 @@ instructions."))
                                             :depends-on ("graph"))
                                      (:file "graph-algorithms"
                                             :depends-on ("graph"))
-                                     (:file "graphviz-support"
-                                            :depends-on ("graph"))
                                      
-                                     (:static-file "notes.text")))
+                                     (:static-file "notes.text")
+
+                                     (:module "graphviz" :depends-on ("graph")
+                                              :components ((:file "graphviz-support")))))
                (:module "website"
                         :components ((:module "source"
                                               :components ((:static-file "index.lml"))))))
@@ -65,3 +66,16 @@ instructions."))
                         :components ((:file "graph-and-variates")
                                      (:file "graph-generation"
                                             :depends-on ("graph-and-variates"))))))
+
+(asdf:defsystem-connection cl-graph-and-cl-graphviz
+  :requires (cl-graph cl-graphviz)
+  :components ((:module "dev"
+                        :components
+                        ((:module "graphviz"
+                                  :components
+                                  ((:file "graphviz-support-optional")))))))
+
+(asdf:defsystem-connection cl-graph-and-metacopy
+  :requires (cl-graph metacopy)
+  :components ((:module "dev"
+                        :components ((:file "copying")))))