Adding libraries as components

[clg] / glib / glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 58be07e8f095d49a10e3eaed2f6516a499896db1..bc1d30e8a9c6e1a0386386f848e694428ca721a5 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -3,33 +3,33 @@
 (asdf:oos 'asdf:load-op :clg-tools)
 
 (defpackage "GLIB-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG" "SHAREDLIB")
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")
   (:export "*GTK-LIBRARY-PATH*"))
 
+(ext:unlock-all-packages)
 
 ;;; Better put this in ~/.cmucl-init.lisp or some other file read at startup
 ;; (setf
 ;;  (logical-pathname-translations "clg")
 ;;  '(("**;*.*.*" "/home/espen/src/clg/**/")))
 
-(ext:unlock-all-packages)
-
 (in-package "GLIB-SYSTEM")
 
 (pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
 
 (defvar *cmucl-include-path* "/usr/lib/cmucl/include")
-(defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir"))
-
 
-(load-shared-library "libglib-2.0")
-(load-shared-library "libgobject-2.0" :init "g_type_init")
+;; TODO: remove this
+(defvar *gtk-library-path* (pkg-variable "gtk+-2.0" "libdir"))
 
 
 (defsystem glib
     :depends-on (clg-tools)
     :components ((:file "defpackage")
                 (:file "pcl")
+                ;; It is necessary to load this before libglib-2.0.so,
+                ;; otherwise our implementation of g_logv won't be
+                ;; used by the library
                 (:unix-dso "alien"
                  :components ((:c-source-file "callback"
                                :definitions ("CMUCL")
@@ -37,15 +37,21 @@
                                :cflags #.(pkg-cflags "glib-2.0"))
                               (:c-source-file "gobject" 
                                :cflags #.(pkg-cflags "glib-2.0"))))
+                (:library "libglib-2.0" 
+                           :libdir #.(pkg-variable "glib-2.0" "libdir")
+                           :depends-on ("alien"))
+                (:library "libgobject-2.0" 
+                           :libdir #.(pkg-variable "glib-2.0" "libdir")
+                           :depends-on ("libglib-2.0"))
                 (:file "utils" :depends-on ("defpackage"))
-                (:file "ffi" :depends-on ("utils" "alien"))
-                (:file "glib" :depends-on ("ffi"))
+                (:file "ffi" :depends-on ("utils"))
+                (:file "glib" :depends-on ("ffi" "libglib-2.0"))
                 (:file "proxy" :depends-on ("pcl" "glib"))
-                (:file "gtype" :depends-on ("proxy"))
+                (:file "gtype" :depends-on ("proxy" "libgobject-2.0"))
                 (:file "gboxed" :depends-on ("gtype"))
                 (:file "genums" :depends-on ("gtype"))
                 (:file "gparam" :depends-on ("genums"))
-                (:file "ginterface" :depends-on ("gtype"))
                 (:file "gobject" :depends-on ("gparam"))
+                (:file "ginterface" :depends-on ("gobject"))
                 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
                 (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject"))))