X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=f9e8bff1ac2534971996732e1d2cc37d5aff191b;hp=c7b3d9297a4e72aa46b06152c7560fcef7a83809;hb=e622ee6f4bf2b9fe81af59d566e651c983a4833b;hpb=21ae7203d719886a1f044992e463d5f463727ac0

diff --git a/clsql.asd b/clsql.asd
index c7b3d92..f9e8bff 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -36,35 +36,41 @@ oriented interface."
 			: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))
+			:depends-on (:database))
 	       (:module :functional
 			:pathname ""
-			:components ((:file "sql")
-				     (:file "table" :depends-on ("sql")))
-			:depends-on (:core))
+			: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")))
+                                    (:file "ooddl" :depends-on ("metaclasses"))
+				    (:file "oodml" :depends-on ("ooddl")))
 		       :depends-on (:functional))
 	       (:module :generic
 			:pathname ""