merge .asd conflicts
Mon May 19 09:43:08 PDT 2008 attila.lendvai@gmail.com
* merge .asd conflicts
diff -rN -u old-verrazano/verrazano.asd new-verrazano/verrazano.asd
--- old-verrazano/verrazano.asd 2014-08-01 17:24:40.000000000 -0700
+++ new-verrazano/verrazano.asd 2014-08-01 17:24:40.000000000 -0700
@@ -5,33 +5,23 @@
:trivial-shell :cl-ppcre :parse-number)
:version "0.5"
:components
- ((:file "packages")
- (:module "frontend"
- :serial t
- :components ((:file "variables")
- (:file "frontend")
- (:file "utility")
- (:file "parser")
- (:file "handlers")
- (:file "analyses")
- (:file "operations")
- (:file "policies")
- (:file "simplifier")
- (:file "backend")
- (:file "filters-and-transformers")
- (:file "driver")
- (:static-file "generate-example-bindings.lisp")))
- (:module "cffi-backend"
- :pathname "backends/cffi/"
- :serial t
- :components ((:file "api")
- (:file "writer")
- (:file "generator")
- (:file "functions")
- (:file "structures")
- (:file "enumerations")
- (:file "types")
- (:file "variables")
- (:file "classes"))
- :depends-on ("frontend")))
- :depends-on (:s-xml :cffi :alexandria :iterate :trivial-shell :cl-ppcre :parse-number))
+ ((:module "src"
+ :components ((:file "flexml") ;; TODO move it into a cxml plugin
+ (:file "packages")
+ (:module "frontend"
+ :depends-on ("packages" "flexml")
+ :serial t
+ :components ((:file "api")
+ (:file "utility")
+ (:file "parser")
+ (:file "analyses")
+ (:file "backend")
+ (:file "filters-and-transformers")
+ (:file "driver")
+ (:static-file "generate-example-bindings.lisp")))
+ (:module "cffi-backend"
+ :pathname "backends/cffi/"
+ :serial t
+ :components ((:file "cffi")
+ (:file "writers"))
+ :depends-on ("frontend"))))))