Commit 1aff4571 authored by Raymond Toy's avatar Raymond Toy

Refactor systems slightly and cleanup code

* Add odepack-package system and update dependencies
* Remove package module from most systems since odepack-package
  defines it.
* Indent code nicely.
parent 2077ce92
......@@ -158,34 +158,44 @@
(:file "xsetf")
(:file "xsetun")))
(mk:defsystem odepack-blas-util
(mk:defsystem odepack-package
:source-pathname (translate-logical-pathname "odepack:")
:binary-pathname (translate-logical-pathname "odepack:lib")
:components
((:module "package"
:source-pathname ""
:components
((:file "package")))
(:module "blas"
((:file "package")))))
(mk:defsystem odepack-blas-util
:source-pathname (translate-logical-pathname "odepack:")
:binary-pathname (translate-logical-pathname "odepack:lib")
:depends-on ("odepack-package")
:components
((:module "blas"
:source-pathname ""
:source-extension "f"
:language :f2cl
:components
(
(:file "dgesl"
:depends-on ("daxpy" "ddot"))
:depends-on ("daxpy"
"ddot"))
(:file "dgbsl"
:depends-on ("daxpy"))
(:file "dgefa"
:depends-on ("idamax" "dscal" "daxpy"))
:depends-on ("idamax"
"dscal"
"daxpy"))
(:file "dgbfa"
:depends-on ("idamax" "dscal" "daxpy"))
:depends-on ("idamax"
"dscal"
"daxpy"))
(:file "idamax")
(:file "dscal")
(:file "daxpy")
(:file "ddot")
(:file "dcopy")
))
(:file "dcopy")))
(:module "util"
:source-pathname ""
:source-extension "f"
......@@ -198,8 +208,7 @@
(:file "iumach")
(:file "dumach"
:depends-on ("dumsum"))
(:file "dumsum")
))))
(:file "dumsum")))))
(mk:defsystem odepack-lsode
:source-pathname (translate-logical-pathname "odepack:")
......@@ -207,28 +216,27 @@
:source-extension "f"
:depends-on ("odepack-blas-util")
:components
((:module "package"
:source-pathname ""
:components
((:file "package")))
(:module "lsode"
((:module "lsode"
:source-pathname ""
:language :f2cl
:source-extension "f"
:compiler-options (:common-as-array t)
:components
(
(:file "dlsode"
((:file "dlsode"
:compiler-options (:common-as-array t :declare-common t)
:depends-on ("dstode" "dewset" "dvnorm"
"dintdy"
"dsolsy"))
:depends-on ("dstode"
"dewset"
"dvnorm"
"dintdy"
"dsolsy"))
(:file "dsolsy")
(:file "dewset")
(:file "dvnorm")
(:file "dintdy")
(:file "dstode"
:depends-on ("dcfode" "dvnorm" "dprepj"))
:depends-on ("dcfode"
"dvnorm"
"dprepj"))
(:file "dcfode")
(:file "dprepj")))))
......@@ -237,33 +245,33 @@
:binary-pathname (translate-logical-pathname "odepack:lib")
:depends-on ("odepack-blas-util")
:components
((:module "package"
:source-pathname ""
:components
((:file "package")))
(:module "lsoda"
((:module "lsoda"
:source-pathname ""
:language :f2cl
:source-extension "f"
:compiler-options (:common-as-array t)
:components
(
(:file "dlsoda"
:depends-on ("dstoda" "dewset" "dmnorm" "dintdy"
"dsolsy")
((:file "dlsoda"
:depends-on ("dstoda"
"dewset"
"dmnorm"
"dintdy"
"dsolsy")
:compiler-options (:common-as-array t :declare-common t))
(:file "dsolsy")
(:file "dstoda"
:depends-on ("dcfode" "dmnorm" "dprja"))
:depends-on ("dcfode"
"dmnorm"
"dprja"))
(:file "dprja"
:depends-on ("dfnorm" "dbnorm"))
:depends-on ("dfnorm"
"dbnorm"))
(:file "dfnorm")
(:file "dbnorm")
(:file "dcfode")
(:file "dintdy")
(:file "dmnorm")
(:file "dewset")
))))
(:file "dewset")))))
(mk:defsystem odepack-lsodar
:source-pathname (translate-logical-pathname "odepack:")
......@@ -271,21 +279,27 @@
:source-extension "f"
:depends-on ("odepack-blas-util")
:components
(
(:module "lsoda"
((:module "lsoda"
:source-pathname ""
:language :f2cl
:source-extension "f"
:compiler-options (:common-as-array t)
:components
(
(:file "dlsodar"
:depends-on ("dewset" "dmnorm" "drchek" "dintdy" "dstoda" "dsolsy")
((:file "dlsodar"
:depends-on ("dewset"
"dmnorm"
"drchek"
"dintdy"
"dstoda"
"dsolsy")
:compiler-options (:common-as-array t :declare-common t))
(:file "dstoda"
:depends-on ("dcfode" "dmnorm" "dprja"))
:depends-on ("dcfode"
"dmnorm"
"dprja"))
(:file "dprja"
:depends-on ("dfnorm" "dbnorm"))
:depends-on ("dfnorm"
"dbnorm"))
(:file "dsolsy")
(:file "dcfode")
(:file "dfnorm")
......@@ -295,8 +309,7 @@
(:file "drchek"
:depends-on ("droots"))
(:file "droots")
(:file "dintdy")
))))
(:file "dintdy")))))
;;; Demo programs
;;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment