X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=162520037dcc8fa2dff25e74a842302304dc96eb;hp=c60ec628b0d2967c9d459134c76d5bac64c44994;hb=31d1a78ee915ae4db7c042b7e5cb1ab7b5a73448;hpb=9f6b242d508ed11519a1e48f360bc59842e39112

diff --git a/clsql.asd b/clsql.asd
index c60ec62..1625200 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql.asd,v 1.7 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,34 +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
-
-(unless (ignore-errors (find-class 'clsql-cl-source-file))
-  (defclass clsql-cl-source-file (cl-source-file) ())
-  (defmethod source-file-type ((c clsql-cl-source-file) (s module)) 
-    "cl"))
-
 (defsystem clsql
-  :default-component-class clsql-cl-source-file
-  :pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
   :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)))) 
+   "cl")