X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=clsql.asd;h=eafc5a8bd292110ac4230d12155dcb6d72d0df8f;hb=a4cc7c882966b6ffa58d78fd4a93f0cf6b73426b;hp=d588c91469fb1037f5eb8aba35cbd43fc49411ca;hpb=9f51f67ab4f038fef0cc9f84bb9db2f4072d8a9e;p=clsql.git

diff --git a/clsql.asd b/clsql.asd
index d588c91..eafc5a8 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.6 2002/09/06 11:08:19 kevin Exp $
+;;;; $Id: clsql.asd,v 1.9 2002/09/19 21:27:54 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,36 +16,24 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-
 (in-package :asdf)
 
-#-clsql-base
-(let ((path (make-pathname :name "clsql-base" :type "system"
-				      :defaults *load-truename*)))
-  (when (probe-file path)
-    (load path)))
-
-;;; System definitions
-
-
 (defsystem clsql
-  :pathname #.(format nil "~A:clsql;"
-		      #+common-lisp-controller "cl-library"
-		      #-common-lisp-controller "clsql")
   :perform (load-op :after (op clsql)
 		    (pushnew :clsql cl:*features*))
-  :components ((:file "package")
-	       (:file "pool" :depends-on ("package"))
-	       (:file "loop-extension")
-	       (:file "sql" :depends-on ("pool"))
-	       (:file "transactions" :depends-on ("sql"))
-	       (:file "functional" :depends-on ("sql"))
-	       (:file "usql" :depends-on ("sql")))
+  :components
+  ((:module :sql
+	    :components
+	    ((:file "package")
+	     (:file "pool" :depends-on ("package"))
+	     (:file "loop-extension")
+	     (:file "sql" :depends-on ("pool"))
+	     (:file "transactions" :depends-on ("sql"))
+	     (:file "functional" :depends-on ("sql"))
+	     (:file "usql" :depends-on ("sql")))))
   :depends-on (:clsql-base)
   )
 
 (defmethod source-file-type  ((c cl-source-file)
-			      (s (eql (find-system 'clsql)))) 
+			      (s (eql (find-system :clsql)))) 
    "cl")
-