X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=2e7efe9659f29145707c95e228405ff79fedfe89;hp=bc128ace30178ac20b640245c31da3fb61eb2a84;hb=2961f4f122593e9d4875e88e6af159de28c8dd47;hpb=7308bdf188da6424e615ca14096ef53cfb845a90

diff --git a/clsql.asd b/clsql.asd
index bc128ac..2e7efe9 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -18,7 +18,7 @@
 (defpackage #:clsql-system (:use #:asdf #:cl))
 (in-package #:clsql-system)
 
-(defsystem #:clsql
+(defsystem clsql
     :name "CLSQL"
     :author "Kevin Rosenberg <kevin@rosenberg.net>"
     :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
@@ -31,47 +31,54 @@ oriented interface."
     :components
     ((:module sql
 	      :components
-	      ((:module :base
+	      ((:module base
 			:pathname ""
 			:components
 			((:file "cmucl-compat")
 			 (:file "package")
-			 (:file "utils" :depends-on ("package" "db-interface"))
+			 (:file "kmr-mop" :depends-on ("package"))
 			 (:file "base-classes" :depends-on ("package"))
-			 (:file "conditions" :depends-on ("base-classes"))
-			 (:file "db-interface" :depends-on ("conditions"))
-			 (:file "initialize" :depends-on ("db-interface" "utils"))
-			 (:file "loop-extension" :depends-on ("db-interface"))
-			 (:file "time" :depends-on ("package"))
+                         (:file "conditions" :depends-on ("base-classes"))
+                         (:file "db-interface" :depends-on ("conditions"))
+			 (:file "time" :depends-on ("package" "conditions"))
+			 (:file "utils" :depends-on ("package" "db-interface"))
+                         (:file "generics" :depends-on ("package"))))
+               (:module database 
+                        :pathname "" 
+                        :components 
+                        ((:file "initialize")
 			 (:file "database" :depends-on ("initialize"))
-			 (:file "recording" :depends-on ("time" "database"))
-			 (:file "basic-sql" :depends-on ("database" "cmucl-compat"))
-			 (:file "pool" :depends-on ("basic-sql"))
-			 (:file "transaction" :depends-on ("basic-sql"))
-			 (:file "kmr-mop" :depends-on ("package"))))
-	       (:module :core
+			 (:file "recording" :depends-on ("database"))
+			 (:file "pool"))
+                        :depends-on (base))
+	       (:module syntax
 			:pathname ""
-			:components ((:file "generics")
-				     (:file "classes" :depends-on ("generics"))
-				     (:file "operations" :depends-on ("classes"))
+			:components ((:file "expressions")
+				     (:file "operations" 
+                                            :depends-on ("expressions"))
 				     (:file "syntax" :depends-on ("operations")))
-			:depends-on (:base))
-	       (:module :functional
+			:depends-on (database))
+	       (:module functional
 			:pathname ""
-			:components ((:file "sql")
-				     (:file "table" :depends-on ("sql")))
-			:depends-on (:core))
-	       (:module :object
+			:components ((:file "fdml")
+                                     (:file "transaction" :depends-on ("fdml"))
+                                     (:file "loop-extension" 
+                                            :depends-on ("fdml"))
+				     (:file "fddl" :depends-on ("fdml")))
+			:depends-on (syntax))
+	       (:module object
 			:pathname ""
-		       :components ((:file "metaclasses")
-				    (:file "objects" :depends-on ("metaclasses")))
-		       :depends-on (:functional))
-	       (:module :generic
+			:components ((:file "metaclasses")
+				     (:file "ooddl" :depends-on ("metaclasses"))
+				     (:file "oodml" :depends-on ("ooddl")))
+			:depends-on (functional))
+	       (:module generic
 			:pathname ""
-		       :components ((:file "generic-postgresql")
-				    (:file "generic-odbc"))
-		       :depends-on (:functional))))))
-     
+			:components ((:file "generic-postgresql")
+				     (:file "generic-odbc")
+				     (:file "sequences"))
+			:depends-on (functional))))))
+
 
 (defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
   (operate 'load-op 'clsql-tests)