--- gforth/libcc.fs	2007/12/31 18:40:24	1.28
+++ gforth/libcc.fs	2008/04/28 08:42:59	1.33
@@ -123,7 +123,16 @@
 \ first-time word, then to the run-time word; the run-time word calls
 \ the c function.
 
-: delete-file 2drop 0 ;
+[ifundef] parse-name
+    ' parse-word alias parse-name
+[then]
+[ifundef] defer!
+: defer! ( xt xt-deferred -- ) \ gforth  defer-store
+\G Changes the @code{defer}red word @var{xt-deferred} to execute @var{xt}.
+    >body [ has? rom [IF] ] @ [ [THEN] ] ! ;
+[then]
+
+\ : delete-file 2drop 0 ;
 
 require struct.fs
 
@@ -205,6 +214,25 @@ end-struct list%
 	    node list-next @
     repeat ;
 
+\ linked libraries
+
+list%
+    cell% 2* field c-lib-string
+end-struct c-lib%
+
+variable c-libs \ linked list of library names (without "lib")
+
+: add-lib ( c-addr u -- )
+\G Add library lib@i{string} to the list of libraries, where
+\G @i{string} is represented by @i{c-addr u}.
+    c-lib% %size allocate throw dup >r
+    c-lib-string 2!
+    r> c-libs list-insert ;
+
+: append-l ( c-addr1 u1 node -- c-addr2 u2 )
+    \ append " -l<nodelib>" to string1
+    >r s"  -l" append r> c-lib-string 2@ append ;
+
 \ C prefix lines
 
 \ linked list of longcstrings: [ link | count-cell | characters ]
@@ -363,7 +391,7 @@ create gen-par-types
     ." ," gen-par-n ." ," gen-par-n ." )" ;
 
 : gen-wrapped-r ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
-    2dup gen-par-r 2>r ." =" gen-wrapped-void 2r> ;
+    2dup gen-par-r 2>r ." =" gen-wrapped-call 2r> ;
 
 : gen-wrapped-func ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
     gen-wrapped-a ;
@@ -435,10 +463,10 @@ create gen-wrapped-types
 : .lib-error ( -- )
     [ifdef] lib-error
         ['] cr stderr outfile-execute
-        lib-error ['] type outfile-execute
+        lib-error ['] type stderr outfile-execute
     [then] ;
 
-DEFER compile-wrapper-function
+DEFER compile-wrapper-function ( -- )
 :NONAME ( -- )
     c-source-file close-file throw
     0 c-source-file-id !
@@ -446,13 +474,17 @@ DEFER compile-wrapper-function
     s" includedir" getenv append ] sliteral
     s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
     lib-filename 2@ append s" .lo" append ( c-addr u )
+\    cr 2dup type
     2dup system drop free throw $? abort" libtool compile failed"
     [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
     tempdir s+ s"  " append
     lib-filename 2@ append s" .lo -o " append
     lib-filename 2@ append s" .la" append ( c-addr u )
+    c-libs @ ['] append-l list-map
+    2dup type cr
     2dup system drop free throw $? abort" libtool link failed"
     lib-filename 2@ s" .la" s+
+\    2dup type cr
     2dup open-lib dup 0= if
         .lib-error true abort" open-lib failed"
     endif
@@ -498,3 +530,11 @@ DEFER compile-wrapper-function
     \G specified stack effect and calls the C function @code{c-name}.
     defer lastxt dup c-function-rt lastxt c-function-ft
     lastxt swap defer! ;
+
+: clear-libs ( -- )
+\G Clear the list of libs
+    c-source-file-id @ if
+	compile-wrapper-function
+    endif
+    0 c-libs ! ;
+clear-libs