Shared object files given unique names

[clg] / glib / glib.asd

diff --git a/glib/glib.asd b/glib/glib.asd
index a12a37f30b9ae7e562acafd29cc1af51112c1246..5ed215ea99a9162d3088bf5139e943d9180f2f89 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -20,28 +20,29 @@
     :components ((:file "defpackage")
                 ;; 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 "glib" :depends-on ("libglib-2.0" "defpackage"))
-                (:file "gtype" :depends-on ("alien" "libgobject-2.0" "glib"))
+                (: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 ("glib" "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