From f0bfc23e327499ef0c415e7cd58a3607b8aae13f Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 31 Oct 2004 11:45:39 +0000 Subject: [PATCH] Loading of shared library done by defsystem Organization: Straylight/Edgeware From: espen --- gdk/gdk.asd | 25 ++++++++++--------------- pango/pango.asd | 16 +++++++++------- pango/pango.lisp | 6 +++--- 3 files changed, 22 insertions(+), 25 deletions(-) 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")))) diff --git a/pango/pango.asd b/pango/pango.asd index fbb895b..a9fc22c 100644 --- a/pango/pango.asd +++ b/pango/pango.asd @@ -1,17 +1,19 @@ ;;; -*- Mode: lisp -*- -(defpackage #:pango-system - (:use #:common-lisp #:asdf #:pkg-config #:sharedlib)) +(defpackage "PANGO-SYSTEM" + (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")) -(in-package #:pango-system) +(in-package "PANGO-SYSTEM") (pkg-exists-p "pango" :atleast-version "1.4.0") -(sharedlib:load-shared-library "libpango-1.0") (defsystem pango - :depends-on (glib) - :components ((:file "defpackage") - (:file "pango" :depends-on ("defpackage")) + :depends-on (glib gdk) + :components ((:library "libpango-1.0" + :libdir #.(pkg-variable "pango" "libdir")) + (:file "defpackage") + (:file "pango" :depends-on ("defpackage" "libpango-1.0")) (:file "export" :depends-on ("pango")))) + diff --git a/pango/pango.lisp b/pango/pango.lisp index a62026b..09a2265 100644 --- a/pango/pango.lisp +++ b/pango/pango.lisp @@ -15,11 +15,11 @@ ;; 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: pango.lisp,v 1.4 2002-03-19 17:14:22 espen Exp $ +;; $Id: pango.lisp,v 1.5 2004-10-31 11:45:39 espen Exp $ (in-package "PANGO") (eval-when (:compile-toplevel :load-toplevel :execute) - (init-types-in-library "libpango-1.0.so" :ignore ("_pango_fribidi_get_type")) + (init-types-in-library "libpango-1.0.so" :ignore ("_pango_fribidi_get_type"))) - (define-types-by-introspection "Pango")) +(define-types-by-introspection "Pango") -- [mdw]