X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/b1c8f43be32503f3911e60696dba8c9194f28ca5..eeed4326c3330d13ba9f8b8b06254d7a370a5d85:/lisp-on-lines.asd

diff --git a/lisp-on-lines.asd b/lisp-on-lines.asd
index 0e32bf7..591a728 100644
--- a/lisp-on-lines.asd
+++ b/lisp-on-lines.asd
@@ -38,21 +38,30 @@ OTHER DEALINGS IN THE SOFTWARE."
   :components ((:static-file "lisp-on-lines.asd")
 	       
 	       (:module :src
-			:components ((:file "contextl-hacks")
+			:components (#-lol-mao(:file "contextl-hacks")
 
 				     (:file "packages")
 				     
-				     (:file "rofl")
+
 				     (:file "utilities")
 				     
-				     (:file "display")
 				     
-				     (:file "attribute")
-				    
-				     (:file "description-class")
-				     (:file "description")
-
-
+				     #+lol-mao 
+				     (:module :mao
+					      :components ((:file "simple-plist-attribute") 
+							   (:file "attribute")				    
+							   (:file "description-class")
+							   (:file "description")
+							   (:module :display
+							    :components ((:file "display-attribute") 
+									 (:file "display-description")				    
+									 (:file "define-description-compat"))
+							    :serial t))
+					      :serial t)
+				     (:file "display")
+				     #-lol-mao(:file "attribute")				    
+				     #-lol-mao(:file "description-class")
+				     #-lol-mao(:file "description")
 
 				    (:module :standard-descriptions
 					      :components ((:file "t")
@@ -60,17 +69,17 @@ OTHER DEALINGS IN THE SOFTWARE."
 							   (:file "edit")
 							   (:file "symbol")
 							   (:file "list")
-							   (:file "clos"))
+							   (:file "null")
+							   (:file "clos")
+							   (:file "validate")
+							   )
 							   
 					      :serial t))
 				     
 				     :serial t))
   :serial t
-  :depends-on (:contextl :arnesi :alexandria :parse-number
-			 ;;for rofl:
-			  :cl-postgres :simple-date :postmodern))
-
-
+  :depends-on (:contextl :arnesi :alexandria :parse-number :yaclml :trivial-garbage
+ ))
 
 
 (defsystem :lisp-on-lines.test
@@ -79,7 +88,6 @@ OTHER DEALINGS IN THE SOFTWARE."
 				     (:file "description-test")
 				     (:file "attribute-test")
 				     (:file "display-test")
-				     (:file "rofl-test")
 				     (:module :standard-descriptions
 				      :components ((:file "edit-test"))
 				      :serial t)
@@ -96,6 +104,4 @@ OTHER DEALINGS IN THE SOFTWARE."
   :depends-on (:lisp-on-lines :lisp-on-lines-ucw :stefil))
 
 
-(if (asdf:find-system :asdf-system-connections nil)
-    (asdf:oos 'asdf:load-op :ucw-system-connections)
-    (#+sbcl sb-int:style-warn #-sbcl warn "UCW suggests asdf-system-connections in order to optionally integrate some other libraries. See http://www.cliki.net/asdf-system-connections for details and download instructions."))
+