X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-simple-streams%2Fsb-simple-streams.asd;h=3e103db33217ec8f87a1d2d0cecd680561fb5bd2;hb=5d3ffab45b1bb78be7f1767e1e439d8f661ab796;hp=e22e85bc0430ab0f2461830e5efecfbc2e813bce;hpb=c9078c1bae4ee38d5e1433c12ae3128f1bb9bc78;p=sbcl.git

diff --git a/contrib/sb-simple-streams/sb-simple-streams.asd b/contrib/sb-simple-streams/sb-simple-streams.asd
index e22e85b..3e103db 100644
--- a/contrib/sb-simple-streams/sb-simple-streams.asd
+++ b/contrib/sb-simple-streams/sb-simple-streams.asd
@@ -1,29 +1,29 @@
 ;;; -*- lisp -*-
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (require :sb-grovel))
-(defpackage #:sb-simple-stream-system (:use #:asdf #:cl #:sb-grovel))
+(defpackage #:sb-simple-stream-system (:use #:asdf #:cl))
 (in-package #:sb-simple-stream-system)
 
 
 (defsystem sb-simple-streams
-  :depends-on (sb-grovel sb-bsd-sockets)
+  :depends-on (sb-bsd-sockets sb-posix)
+  #+sb-building-contrib :pathname
+  #+sb-building-contrib #p"SYS:CONTRIB;SB-SIMPLE-STREAMS;"
   :components ((:file "package")
                (:file "fndb")
-               (grovel-constants-file "constants"
-                                      :package :sb-simple-streams
-                                      :pathname "constants.lisp"
-                                      :depends-on ("package"))
-               (:file "unix" :depends-on ("constants"))
+               (:file "iodefs" :depends-on ("package"))
                ;;(:file "pcl")
                ;;(:file "ext-format" :depends-on ("package"))
-               (:file "classes" :depends-on ("package"))
+               (:file "classes" :depends-on ("iodefs"))
                (:file "internal" :depends-on ("classes"))
                (:file "strategy" :depends-on ("internal"))
-               (:file "cl" :depends-on ("internal" "fndb"))
-               (:file "simple-streams" :depends-on ("cl" "strategy" "unix"))
+               (:file "impl" :depends-on ("internal" "fndb" "file" "string"))
+               (:file "file" :depends-on ("strategy"))
+               (:file "direct" :depends-on ("strategy"))
+               (:file "null" :depends-on ("strategy"))
+               (:file "socket" :depends-on ("strategy"))
+               (:file "string" :depends-on ("strategy"))
+               (:file "terminal" :depends-on ("strategy"))
                ;;(:file "gray-compat" :depends-on ("package"))
-               ;;(:file "iodefs" :depends-on ("package"))
                ))
 
 (defmethod perform :after ((o load-op)
@@ -43,5 +43,3 @@
                     (c (eql (find-system :sb-simple-streams-tests))))
   (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
       (error "test-op failed")))
-
-