From 05aa4445a1663c1f2ca2da24c77a175b50b2727a Mon Sep 17 00:00:00 2001 Message-Id: <05aa4445a1663c1f2ca2da24c77a175b50b2727a.1715237356.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 31 Oct 2004 11:44:45 +0000 Subject: [PATCH] Loading of shared library doen by defsystem Organization: Straylight/Edgeware From: espen --- atk/atk.asd | 11 ++++++----- atk/atk.lisp | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/atk/atk.asd b/atk/atk.asd index 67e9b60..e46949b 100644 --- a/atk/atk.asd +++ b/atk/atk.asd @@ -1,17 +1,18 @@ ;;; -*- Mode: lisp -*- (defpackage "ATK-SYSTEM" - (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB")) + (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")) (in-package "ATK-SYSTEM") (pkg-exists-p "atk" :atleast-version "1.6.0") -(sharedlib:load-shared-library "libatk-1.0") (defsystem atk - :depends-on (glib) - :components ((:file "defpackage") - (:file "atk" :depends-on ("defpackage")) + :depends-on (glib gdk) + :components ((:library "libatk-1.0" + :libdir #.(pkg-variable "atk" "libdir")) + (:file "defpackage") + (:file "atk" :depends-on ("defpackage" "libatk-1.0")) (:file "export" :depends-on ("atk")))) diff --git a/atk/atk.lisp b/atk/atk.lisp index f3662e0..1f9a731 100644 --- a/atk/atk.lisp +++ b/atk/atk.lisp @@ -15,11 +15,12 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: atk.lisp,v 1.2 2002-03-19 17:15:05 espen Exp $ +;; $Id: atk.lisp,v 1.3 2004-10-31 11:44:45 espen Exp $ (in-package "ATK") + (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library "libatk-1.0.so") + (init-types-in-library "libatk-1.0.so")) - (define-types-by-introspection "Atk")) +(define-types-by-introspection "Atk") -- [mdw]