r2385: *** empty log message ***

[uffi.git] / uffi.system

diff --git a/uffi.system b/uffi.system
index 545fd4760a0ee2e96eacda9fbae4d3dfde25db92..12483e078fda82f20b6b7fc8c08972e1049e48ee 100644 (file)
--- a/uffi.system
+++ b/uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: uffi.system,v 1.15 2002/07/26 03:18:27 kevin Exp $
+;;;; $Id: uffi.system,v 1.16 2002/08/23 15:29:06 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,17 +19,36 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :make)
 
-;; For use with non-Debian installations
+;;; UFFI system definition (for Common Lisp Controller systems)
+
+#+common-lisp-controller
+(make:defsystem :uffi
+    :source-pathname #-mcl "cl-library:uffi;"
+                     #+mcl "cl-library:uffi;mcl;"
+    :source-extension "cl"
+    :components 
+    ((:file "package")
+     (:file "primitives" :depends-on ("package"))
+     (:file "strings" :depends-on ("primitives"))
+     (:file "objects" :depends-on ("primitives"))
+     (:file "aggregates" :depends-on ("primitives"))
+     (:file "functions" :depends-on ("primitives"))
+     (:file "libraries" :depends-on ("package")))
+    :finally-do
+    (pushnew :uffi cl:*features*))
+
+;; For use with non-Common Lisp Controller installations
+
+#-common-lisp-controller
 (let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
                                      :defaults *load-truename*)))
   (when (probe-file helper-pathname)
       (load helper-pathname)))
 
-;;; UFFI system definition
-
+#-common-lisp-controller
 (make:defsystem :uffi
-    :source-pathname #-mcl "cl-library:uffi;"
-                     #+mcl "cl-library:uffi;mcl;"
+    :source-pathname #-mcl "cl-library:uffi;src;"
+                     #+mcl "cl-library:uffi;src;mcl;"
     :source-extension "cl"
     :components 
     ((:file "package")