--- gforth/libcc.fs	2007/05/29 20:44:38	1.15
+++ gforth/libcc.fs	2007/06/04 18:13:26	1.19
@@ -140,8 +140,6 @@ variable lib-handle-addr \ points to the
 
 \ linked list stuff (should go elsewhere)
 
-hex
-
 struct
     cell% field list-next
     1 0   field list-payload
@@ -189,10 +187,12 @@ variable c-prefix-lines-end c-prefix-lin
     align here 0 , c-prefix-lines-end list-append ( c-addr u )
     longstring, ;
 
-: \c ( "rest-of-line" -- )
+: \c ( "rest-of-line" -- ) \ gforth backslash-c
+    \G One line of C declarations for the C interface
     -1 parse save-c-prefix-line ;
 
-\c #include "engine/libcc.h"
+s" #include <gforth/" version-string s+ s" /libcc.h>" append ( c-addr u )
+  2dup save-c-prefix-line drop free throw
 
 \ Types (for parsing)
 
@@ -367,9 +367,15 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
+: tempdir ( -- c-addr u )
+    s" TMPDIR" getenv dup 0= if
+        2drop s" /tmp"
+    then ;
+
 : gen-filename ( x -- c-addr u )
     \ generates a filename without extension for lib-handle-addr X
-    0 <<# ['] #s $10 base-execute 'x hold 'x hold 'x hold #> save-mem #>> ;
+    0 <<# ['] #s $10 base-execute #> 
+    tempdir s" /gforth-c-" s+ 2swap append #>> ;
 
 : init-c-source-file ( -- )
     c-source-file-id @ 0= if
@@ -387,10 +393,11 @@ create gen-wrapped-types
     0 c-source-file-id !
     s" gcc -fPIC -shared -Wl,-soname," lib-filename 2@ s+
     s" .so.1 -Wl,-export_dynamic -o " append lib-filename 2@ append
-    s" .so.1 -O " append lib-filename 2@ append s" .c" append ( c-addr u )
+    [ s" .so.1 -O -I " s" includedir" getenv append s"  " append ] sliteral
+    append lib-filename 2@ append s" .c" append ( c-addr u )
     2dup system drop free throw
     $? abort" compiler generated error" \ !! call dlerror
-    s" ./" lib-filename 2@ s+ s" .so.1" append
+    lib-filename 2@ s" .so.1" s+
     2dup open-lib dup 0= abort" open-lib failed" \ !! call dlerror
     ( lib-handle ) lib-handle-addr @ !
     2dup delete-file throw drop free throw
@@ -427,16 +434,8 @@ create gen-wrapped-types
   does> ( ... -- ... )
     @ call-c ;
 
-: c-function ( "forth-name" "c-name" "{libcc-type}" "--" "libcc-type" -- )
+: c-function ( "forth-name" "c-name" "@{type@}" "--" "type" -- ) \ gforth
+    \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
+    \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! ;
-
-s" Library not found" exception constant err-nolib
-
-: library ( "name" "file" -- ) \ gforth
-\G Dynamically links the library specified by @i{file}.  Defines a
-\G word @i{name} ( -- lib ) that starts the declaration of a
-\G function from that library.
-    create parse-name open-lib dup 0= err-nolib and throw ,
-  does> ( -- lib )
-    @ ;