X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/89b927eccccca3e1ed0c8f154399e0f385276215..c0bc39e53c16a7e408b7bb0ecb13dc605f0b8ea4:/glib/glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index 7c6bbb2..5ed215e 100644
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -1,16 +1,11 @@
 ;;; -*- Mode: lisp -*-
 
 (asdf:oos 'asdf:load-op :clg-tools)
+(asdf:oos 'asdf:load-op :gffi)
 
 (defpackage "GLIB-SYSTEM"
   (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
-#+cmu(ext:unlock-all-packages)
-#+sbcl
-(progn
-  (sb-ext:unlock-package "COMMON-LISP")
-  (sb-ext:unlock-package "SB-PCL"))
-
 ;;; Better put this in ~/.cmucl-init.lisp or some other file read at startup
 ;; (setf
 ;;  (logical-pathname-translations "clg")
@@ -18,45 +13,36 @@
 
 (in-package "GLIB-SYSTEM")
 
-(pkg-exists-p "glib-2.0" :atleast-version "2.4.0")
-
-(when (string>= (pkg-version "glib-2.0") "2.6.0")
-  (push :glib2.6 *features*))
-
-(when (string>= (pkg-version "glib-2.0") "2.8.0")
-  (push :glib2.8 *features*))
+(pkg-exists-p "glib-2.0" :atleast-version "2.4.0" :error t)
 
 (defsystem glib
-    :depends-on (clg-tools)
+    :depends-on (clg-tools gffi)
     :components ((:file "defpackage")
-		 #+(and cmu (not non-broken-pcl) (not cmu19b))(:file "pcl")
 		 ;; For preloading to work in glib 2.6, the library needs to 
 		 ;; be configured and build with '--disable-visibility'
-  		 (:unix-dso "preload"
+  		 (:shared-object "glib-preload" :pathname "preload/"
   		  :components ((:c-source-file "logging"
   				:cflags #.(pkg-cflags "glib-2.0"))))
-		 (:library "libglib-2.0" 
-			    :libdir #.(pkg-variable "glib-2.0" "libdir")
- 			    :depends-on ("preload"))
-		 (:library "libgobject-2.0" 
-			    :libdir #.(pkg-variable "glib-2.0" "libdir")
-			    :depends-on ("libglib-2.0"))
-		 (:unix-dso "alien"
-		  :components ((:c-source-file "callback"
-				:cflags #.(pkg-cflags "glib-2.0"))
-			       (:c-source-file "gobject" 
+		 (:library "libglib-2.0"
+		  :libdir #.(pkg-libdir "glib-2.0")
+		  :libname #-win32 "libglib-2.0"
+		           #+win32 "libglib-2.0-0"
+		  :depends-on ("glib-preload"))
+		 (:library "libgobject-2.0"
+		  :libdir #.(pkg-libdir "glib-2.0")
+		  :libname #-win32 "libgobject-2.0"
+		           #+win32 "libgobject-2.0-0"
+		  :depends-on ("libglib-2.0"))
+		 (:shared-object "glib-alien" :pathname "alien/"
+		  :components ((:c-source-file "gobject" 
 				:cflags #.(pkg-cflags "glib-2.0")))
 		  :depends-on ("libgobject-2.0"))
-		 (:file "utils" :depends-on ("defpackage"))
-		 (:file "ffi" :depends-on ("utils"))
-		 (:file "glib" :depends-on ("ffi" "libglib-2.0"))
-		 (:file "proxy" :depends-on (#+(and cmu (not non-broken-pcl) (not cmu19b))"pcl" "glib"))
-		 (:file "gtype" :depends-on ("proxy" "alien" "libgobject-2.0"))
+		 (:file "glib" :depends-on ("libglib-2.0" "defpackage"))
+		 (:file "gtype" :depends-on ("glib-alien" "libgobject-2.0" "glib"))
 		 (:file "gboxed" :depends-on ("gtype"))
 		 (:file "genums" :depends-on ("gtype"))
 		 (:file "gparam" :depends-on ("genums"))
 		 (:file "gobject" :depends-on ("gparam"))
 		 (:file "ginterface" :depends-on ("gobject"))
-		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject" "alien"))
-		 (:file "gerror" :depends-on ("gcallback"))
-		 (:file "export" :depends-on ("utils" "glib" "proxy" "gboxed" "gtype" "gparam" "gcallback" "genums" "gobject" "gerror"))))
+		 (:file "gcallback" :depends-on ("gtype" "gparam" "gobject"))
+		 (:file "gerror" :depends-on ("gcallback"))))
\ No newline at end of file