[lisplab-cvs] r225 - trunk
jivestgarden at common-lisp.net
jivestgarden at common-lisp.net
Sun Apr 15 19:16:31 UTC 2012
Author: jivestgarden
Date: Sun Apr 15 12:16:31 2012
New Revision: 225
Log:
Cleaned asdf file. Poorly tested
Modified:
trunk/lisplab.asd
Modified: trunk/lisplab.asd
==============================================================================
--- trunk/lisplab.asd Sun Apr 15 11:48:36 2012 (r224)
+++ trunk/lisplab.asd Sun Apr 15 12:16:31 2012 (r225)
@@ -26,6 +26,10 @@
;; Default system, without all libs
:depends-on
(:lisplab-base
+ :lisplab-level0
+ :lisplab-level1
+ :lisplab-level2
+ :lisplab-level3
:lisplab-matlisp
:lisplab-fftw
:slatec
@@ -39,6 +43,7 @@
; :depends-on (:lisplab-base :quadpack)
:components ((:file "quadpack")))))
+
(defsystem :lisplab-base
:depends-on ()
:serial t
@@ -59,16 +64,38 @@
(:file "store-ordinary-functions")
(:file "integer-store-functions")
(:file "permutation")
- ))
+ ))))
+
+(defsystem :lisplab-level0
+ :depends-on (:lisplab-base)
+ :components
+ (
(:module :src/interface/0
- :depends-on ("package")
- :serial t
+ :depends-on ()
:components
((:file "level0-interface")))
+ ;;
+ ;; All core none-matrix stuff (level 0)
+ ;;
+ (:module :src/core
+ :depends-on (:src/interface/0)
+ :components
+ ((:file "level0-functions")
+ (:file "level0-thread")))
- (:module :src/interface/1
+ (:module :src/list
:depends-on (:src/interface/0)
+ :components ((:file "list")))
+ ))
+
+
+(defsystem :lisplab-level1
+ :depends-on (:lisplab-level0)
+ :components
+ (
+ (:module :src/interface/1
+ :depends-on ()
:serial t
:components
((:file "level1-element")
@@ -77,45 +104,18 @@
(:file "matrix1-interface")
(:file "matrix1-classes")))
- (:module :src/interface/2
- :depends-on (:src/interface/1)
- :serial t
- :components
- ((:file "vector2-interface")
- (:file "matrix2-interface")))
-
- (:module :src/interface/3
- :depends-on (:src/interface/2)
- :serial t
- :components
- ((:file "level3-io-interface")
- (:file "level3-linalg-interface")
- (:file "level3-fft-interface")))
-
- ;;
- ;; All core none-matrix stuff (level 0)
- ;;
- (:module :src/core
- :depends-on (:src/interface/0)
- :components
- ((:file "level0-functions")
- (:file "level0-thread")))
-
(:module :src/vector/1/df
:depends-on (:src/interface/1)
- :serial t
:components
((:file "vector1-d")))
(:module :src/vector/1/z
:depends-on (:src/interface/1)
- :serial t
:components
((:file "vector1-z")))
(:module :src/vector/1/ub
:depends-on (:src/interface/1)
- :serial t
:components
((:file "vector1-ub1")
(:file "vector1-ub8")
@@ -140,29 +140,40 @@
(:module :src/matrix/1/df
:depends-on (:src/interface/1)
- :serial t
:components
((:file "matrix1-dge")
(:file "matrix1-ddiag")
(:file "matrix1-dgt")))
(:module :src/matrix/1/z
- :depends-on (:src/core :src/matrix/1 :src/vector/1/z)
- :serial t
+ :depends-on (:src/interface/1)
:components
((:file "matrix1-zge")))
(:module :src/matrix/1/ub
- :depends-on (:src/interface/1 :src/vector/1/ub)
- :serial t
+ :depends-on (:src/interface/1)
:components
((:file "matrix1-ub1")
(:file "matrix1-ub8")
(:file "matrix1-ub16")
- (:file "matrix1-ub32")
- ))
+ (:file "matrix1-ub32")))
- (:module :src/vector/2
+ ))
+
+
+(defsystem :lisplab-level2
+ :depends-on (:lisplab-level1)
+ :components
+ (
+ (:module :src/interface/2
+ :depends-on ()
+ :serial t
+ :components
+ ((:file "vector2-interface")
+ (:file "matrix2-interface")))
+
+
+(:module :src/vector/2
:depends-on (:src/interface/2)
:serial t
:components
@@ -171,60 +182,61 @@
(:file "vector2-function")))
(:module :src/vector/2/df
- :depends-on (:src/interface/2 :src/vector/1/df)
- :serial t
+ :depends-on (:src/interface/2)
:components
( (:file "vector2-dge")))
(:module :src/vector/2/z
- :depends-on (:src/vector/2 :src/vector/1/z)
- :serial t
+ :depends-on (:src/interface/2)
:components
((:file "vector2-zge")))
(:module :src/vector/2/ub
- :depends-on (:src/interface/2 :src/vector/1/ub)
- :serial t
+ :depends-on (:src/interface/2)
:components
((:file "vector2-integer-functions")))
- (:module :src/list
- :depends-on (:src/interface/0)
- :serial t
- :components ((:file "list")))
-
(:module :src/matrix/2
- :depends-on (:src/interface/2 :src/matrix/1)
- :serial t
+ :depends-on (:src/interface/2)
:components
((:file "matrix2-constructors")))
(:module :src/matrix/2/generic
- :depends-on (:src/interface/2 :src/matrix/1)
+ :depends-on (:src/interface/2)
:serial t
:components
((:file "matrix2-generic")
(:file "matrix2-view")))
(:module :src/matrix/2/df
- :depends-on (:src/interface/2 :src/vector/2/df)
- :serial t
+ :depends-on (:src/interface/2)
:components
- (
- (:file "matrix2-dge")))
+ ((:file "matrix2-dge")))
(:module :src/matrix/2/ub
- :depends-on (:src/matrix/2 :src/vector/2/ub)
- :serial t
+ :depends-on (:src/interface/2)
:components
((:file "matrix2-integer-constructors")))
-
+
+ ))
+
+
+(defsystem :lisplab-level3
+ :depends-on (:lisplab-level2)
+ :components
+ (
+ (:module :src/interface/3
+ :depends-on ()
+ :components
+ ((:file "level3-io-interface")
+ (:file "level3-linalg-interface")
+ (:file "level3-fft-interface")))
+
;;
;; IO (level 3)
;;
(:module :src/io
- :depends-on (:src/matrix/2)
- :serial t
+ :depends-on (:src/interface/3)
:components
((:file "level3-io")
(:file "ieee-floats")
@@ -234,8 +246,7 @@
;; Linear algebra lisp implementation (Level 3)
;;
(:module :src/linalg
- :depends-on (:src/matrix/2)
- :serial t
+ :depends-on (:src/interface/3)
:components
((:file "level3-linalg-generic")
(:file "level3-linalg-dge")))
@@ -244,8 +255,7 @@
;; Fast Fourier transform (Level 3)
;;
(:module :src/fft
- :depends-on (:src/matrix/2)
- :serial t
+ :depends-on (:src/interface/3)
:components
((:file "level3-fft-generic")
(:file "level3-fft-zge")))
@@ -254,19 +264,18 @@
;; Euler and Runge-Kutt solvers (Level 3)
;;
(:module :src/extra
- :depends-on (:src/matrix/2)
- :serial t
+ :depends-on ()
:components
- (
- (:file "level3-rk4")
+ ((:file "level3-rk4")
(:file "level3-euler")
(:file "extra")
(:file "infpre")
))
))
+
(defsystem :lisplab-matlisp
- :depends-on (:lisplab-base)
+ :depends-on (:lisplab-level3)
:serial t
:components
(
@@ -305,7 +314,7 @@
(:file "tridiag")))))
(defsystem :lisplab-fftw
- :depends-on (:lisplab-base)
+ :depends-on (:lisplab-level1)
:serial t
:components
(
More information about the lisplab-cvs
mailing list