X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/05aa4445a1663c1f2ca2da24c77a175b50b2727a..f0bfc23e327499ef0c415e7cd58a3607b8aae13f:/gdk/gdk.asd

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 2ff5130..885446a 100644
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -1,31 +1,26 @@
 ;;; -*- Mode: lisp -*-
 
 (defpackage "GDK-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB"))
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 (in-package "GDK-SYSTEM")
 
 (pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
 
 
-(load-shared-library "libgdk_pixbuf-2.0")
-(load-shared-library "libgdk-x11-2.0"
-		     :init "gdk_init"
-		     :prototype '(alien:function
-				  c-call:void
-				  alien:system-area-pointer
-				  alien:system-area-pointer)
-		     :initargs (list (system:int-sap 0) (system:int-sap 0)))
-
-
-
 (defsystem gdk
     :depends-on (glib)
     :components ((:file "defpackage")
+		 (:library "libgdk_pixbuf-2.0" 
+			   :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
+		 (:library "libgdk-x11-2.0" 
+			   :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
 		 (:unix-dso "alien"
-		  :components ((:c-source-file "glue"
-				:cflags #.(pkg-cflags "gtk+-2.0"))))
-		 (:file "gdktypes" :depends-on ("defpackage" "alien"))
+			    :components ((:c-source-file "glue"
+					  :cflags #.(pkg-cflags "gtk+-2.0"))))
+		 (:file "gdktypes" :depends-on ("defpackage" "alien" 
+						"libgdk_pixbuf-2.0" 
+						"libgdk-x11-2.0"))
 		 (:file "gdkevents" :depends-on ("gdktypes"))
 		 (:file "gdk" :depends-on ("gdkevents"))
 		 (:file "export" :depends-on ("gdkevents" "gdktypes" "gdk"))))