From ad0ae8dc63ea8aa48dac4498b85015f21f48dc69 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Wed, 26 Jul 2006 04:36:22 +0000
Subject: [PATCH] Remove add-simple-library

---
 contrib/cairo/load.factor            |  2 --
 contrib/postgresql/load.factor       |  2 --
 contrib/sqlite/load.factor           |  2 --
 library/bootstrap/boot-stage2.factor |  1 +
 library/compiler/alien/aliens.factor |  4 ----
 library/io/windows/load.factor       |  9 ---------
 library/ui/windows/load.factor       | 14 +++++++-------
 7 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/contrib/cairo/load.factor b/contrib/cairo/load.factor
index 05158e65bb..b00e81511f 100644
--- a/contrib/cairo/load.factor
+++ b/contrib/cairo/load.factor
@@ -1,5 +1,3 @@
 USING: alien ;
 
-"cairo" "libcairo" add-simple-library
-
 PROVIDE: cairo { "cairo.factor" } ;
diff --git a/contrib/postgresql/load.factor b/contrib/postgresql/load.factor
index 9464a33b03..f0c17c4cd9 100644
--- a/contrib/postgresql/load.factor
+++ b/contrib/postgresql/load.factor
@@ -1,7 +1,5 @@
 USING: alien ;
 
-"postgresql" "libpq" add-simple-library
-
 PROVIDE: postgresql
 { "libpq.factor" "postgresql.factor" }
 { "postgresql-test" } ;
diff --git a/contrib/sqlite/load.factor b/contrib/sqlite/load.factor
index 2e5fc3920e..a2c4b59836 100644
--- a/contrib/sqlite/load.factor
+++ b/contrib/sqlite/load.factor
@@ -1,7 +1,5 @@
 USING: alien ;
 
-"sqlite" "libsqlite3" add-simple-library
-
 PROVIDE: sqlite
 { "sqlite.factor" "tuple-db.factor" }
 { "tuple-db-tests.factor" } ;
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index e5e90085c1..2ce6016f3e 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -21,6 +21,7 @@ parser sequences sequences-internals words ;
         windows? [
             "/library/ui/windows/load.factor" run-resource
         ] when
+
         "native-io" get [
             unix? [
                 "/library/io/unix/load.factor" run-resource
diff --git a/library/compiler/alien/aliens.factor b/library/compiler/alien/aliens.factor
index 53c8425c4a..4e45591025 100644
--- a/library/compiler/alien/aliens.factor
+++ b/library/compiler/alien/aliens.factor
@@ -37,9 +37,5 @@ global [ "libraries" nest drop ] bind
         [ "abi" set "name" set ] make-hash swap set
     ] bind ;
 
-: add-simple-library ( name file -- ) 
-    windows? ".dll" ".so" ? append
-    windows? "stdcall" "cdecl" ? add-library ;
-
 : library-abi ( library -- abi )
     library "abi" swap ?hash [ "cdecl" ] unless* ;
diff --git a/library/io/windows/load.factor b/library/io/windows/load.factor
index ae19852dd8..ebd4e2393f 100644
--- a/library/io/windows/load.factor
+++ b/library/io/windows/load.factor
@@ -1,15 +1,6 @@
 IN: scratchpad
 USING: alien compiler kernel namespaces parser sequences words ;
 
-{
-    { "gdi32" "gdi32" }
-    { "user32" "user32" }
-    { "kernel32" "kernel32" }
-    { "winsock" "ws2_32" }
-    { "mswsock" "mswsock" }
-} [ first2 add-simple-library ] each
-"libc"     "msvcrt.dll"   "cdecl"   add-library
-
 { 
     "io"
     "errors"
diff --git a/library/ui/windows/load.factor b/library/ui/windows/load.factor
index 9da031b491..333a426be5 100644
--- a/library/ui/windows/load.factor
+++ b/library/ui/windows/load.factor
@@ -2,13 +2,13 @@ IN: scratchpad
 USING: alien compiler kernel namespaces parser sequences words ;
 
 {
-    { "gdi32" "gdi32" }
-    { "user32" "user32" }
-    { "kernel32" "kernel32" }
-    { "winsock" "ws2_32" }
-    { "mswsock" "mswsock" }
-} [ first2 add-simple-library ] each
-"libc"     "msvcrt.dll"   "cdecl"   add-library
+    { "gdi32"    "gdi32.dll"    "stdcall" }
+    { "user32"   "user32.dll"   "stdcall" }
+    { "kernel32" "kernel32.dll" "stdcall" }
+    { "winsock"  "ws2_32.dll"   "stdcall" }
+    { "mswsock"  "mswsock.dll"  "stdcall" }
+    { "libc"     "msvcrt.dll"   "cdecl"   }
+} [ first3 add-library ] each
 
 { 
     "windows-messages"