Use CLOSER-COMMON-LISP package to resolve conflicts between CL and C2MOP

[clinton/lisp-on-lines.git] / lisp-on-lines.asd

diff --git a/lisp-on-lines.asd b/lisp-on-lines.asd
index 04a4d55..c6f5a74 100644 (file)
--- a/lisp-on-lines.asd
+++ b/lisp-on-lines.asd
@@ -36,24 +36,21 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE."
   :components ((:static-file "lisp-on-lines.asd")
-              
               (:module :src
-                       :components ((:file "contextl-hacks")
-
-                                    (:file "packages")
-                                    
-
+                       :components ((:file "packages")
                                     (:file "utilities")
-                                    
+                                    (: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")
-                                    
-                                    (:file "attribute")
-                                   
-                                    (:file "description-class")
-                                    (:file "description")
-
-
-
                                    (:module :standard-descriptions
                                              :components ((:file "t")
                                                           (:file "inline")