Shared object files given unique names

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index 2ac3c0b6ff6f7da5de6116792e77424bbd4240a0..a3fabc807e515e7353c3912b4e2701e6fb8711f8 100644 (file)
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -11,19 +11,19 @@
     :depends-on (gffi glib pango #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
                 (:library "libgdk_pixbuf-2.0" 
     :depends-on (gffi glib pango #?(pkg-exists-p "gdk-2.0" :atleast-version "2.8.0") cairo)
     :components ((:file "defpackage")
                 (:library "libgdk_pixbuf-2.0" 

-                          :libdir #.(pkg-libdir "gdk-2.0")
-                          :libname #-win32 "libgdk_pixbuf-2.0" 
-                                   #+win32 "libgdk_pixbuf-2.0-0")
+                 :libdir #.(pkg-libdir "gdk-2.0")
+                 :libname #-win32 "libgdk_pixbuf-2.0" 
+                          #+win32 "libgdk_pixbuf-2.0-0")

                 (:library "libgdk-2.0" 
                 (:library "libgdk-2.0" 

-                          :libdir #.(pkg-libdir "gdk-2.0")
-                          :libname #-win32 "libgdk-x11-2.0"
-                                   #+win32 "libgdk-win32-2.0-0")
-                (:unix-dso "alien"
-                           :ldflags #.(pkg-libs "gdk-2.0")
-                           :components ((:c-source-file "glue"
-                                         :cflags #.(pkg-cflags "gdk-2.0")))
-                           :depends-on (#+cmu "libgdk-2.0"))
-                (:file "gdktypes" :depends-on ("defpackage" "alien" 
+                 :libdir #.(pkg-libdir "gdk-2.0")
+                 :libname #-win32 "libgdk-x11-2.0"
+                          #+win32 "libgdk-win32-2.0-0")
+                (:shared-object "gdk-alien" :pathname "alien/"
+                 :ldflags #.(pkg-libs "gdk-2.0")
+                 :components ((:c-source-file "glue"
+                               :cflags #.(pkg-cflags "gdk-2.0")))
+                 :depends-on (#+cmu "libgdk-2.0"))
+                (:file "gdktypes" :depends-on ("defpackage" "gdk-alien" 

                                                "libgdk_pixbuf-2.0" 
                                                "libgdk-2.0"))
                 (:file "gdkevents" :depends-on ("gdktypes"))
                                                "libgdk_pixbuf-2.0" 
                                                "libgdk-2.0"))
                 (:file "gdkevents" :depends-on ("gdktypes"))

diff --git a/gffi/gffi.asd b/gffi/gffi.asd
index 72a555900f4083b227d75f19a3642bf8216ebd89..b19fdfd373a2db07e424b5b9d9e84926d3b72c52 100644 (file)
--- a/gffi/gffi.asd
+++ b/gffi/gffi.asd
@@ -29,10 +29,11 @@
     :depends-on (clg-tools)
     :components ((:file "defpackage")
                 #+(and cmu19a (not non-broken-pcl))(:file "pcl")
     :depends-on (clg-tools)
     :components ((:file "defpackage")
                 #+(and cmu19a (not non-broken-pcl))(:file "pcl")

-                (:unix-dso "alien" :components ((:c-source-file "memory")))
+                (:shared-object "gffi-alien" :pathname "alien/"
+                 :components ((:c-source-file "memory")))

                 (:file "memory" :depends-on ("defpackage"))
                 (:file "interface" :depends-on ("memory"))
                 (:file "memory" :depends-on ("defpackage"))
                 (:file "interface" :depends-on ("memory"))

-                (:file "basic-types" :depends-on ("alien" "interface"))
+                (:file "basic-types" :depends-on ("gffi-alien" "interface"))

                 (:file "vectors" :depends-on ("basic-types"))
                 (:file "enums" :depends-on ("basic-types"))
                 (:file "virtual-slots" :depends-on (#+(and cmu19a (not non-broken-pcl))"pcl" "interface" "basic-types"))
                 (:file "vectors" :depends-on ("basic-types"))
                 (:file "enums" :depends-on ("basic-types"))
                 (:file "virtual-slots" :depends-on (#+(and cmu19a (not non-broken-pcl))"pcl" "interface" "basic-types"))

diff --git a/glib/glib.asd b/glib/glib.asd
index 58ffaf77cb35ed4a178d2b96b24d3964e9ccdbb4..5ed215ea99a9162d3088bf5139e943d9180f2f89 100644 (file)
--- a/glib/glib.asd
+++ b/glib/glib.asd
@@ -20,25 +20,25 @@
     :components ((:file "defpackage")
                 ;; For preloading to work in glib 2.6, the library needs to 
                 ;; be configured and build with '--disable-visibility'
     :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"
                  :components ((:c-source-file "logging"
                                :cflags #.(pkg-cflags "glib-2.0"))))
                 (:library "libglib-2.0"

-                          :libdir #.(pkg-libdir "glib-2.0")
-                          :libname #-win32 "libglib-2.0"
-                                   #+win32 "libglib-2.0-0"
-                          :depends-on ("preload"))
+                 :libdir #.(pkg-libdir "glib-2.0")
+                 :libname #-win32 "libglib-2.0"
+                          #+win32 "libglib-2.0-0"
+                 :depends-on ("glib-preload"))

                 (:library "libgobject-2.0"
                 (: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"))
-                (:unix-dso "alien"
+                 :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"))
                  :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 "gboxed" :depends-on ("gtype"))
                 (:file "genums" :depends-on ("gtype"))
                 (:file "gparam" :depends-on ("genums"))

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index f56cde8b5ca9f6f414c5cc751c04c18e95fbfb4d..49de599ebbd878979c371c85a1bfbc4350fe3734 100644 (file)
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -13,16 +13,15 @@
     :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")
                 (:library "libgtk-2.0" 
     :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")
                 (:library "libgtk-2.0" 

-                          :libdir #.(pkg-libdir "gtk+-2.0")
-                          :libname #-win32 "libgtk-x11-2.0"
-                                   #+win32 "libgtk-win32-2.0-0")
-                (:unix-dso "alien"
-                           :ldflags #.(pkg-libs "gtk+-2.0")
-                           :components ((:c-source-file "glue"
-                                         :cflags #.(pkg-cflags "gtk+-2.0")))
-                           :depends-on (#+cmu "libgtk-2.0"))
-                (:file "gtkobject" 
-                       :depends-on ("defpackage" "alien" "libgtk-2.0"))
+                 :libdir #.(pkg-libdir "gtk+-2.0")
+                 :libname #-win32 "libgtk-x11-2.0"
+                          #+win32 "libgtk-win32-2.0-0")
+                (:shared-object "gtk-alien" :pathname "alien/"
+                 :ldflags #.(pkg-libs "gtk+-2.0")
+                 :components ((:c-source-file "glue"
+                               :cflags #.(pkg-cflags "gtk+-2.0")))
+                 :depends-on (#+cmu "libgtk-2.0"))
+                (:file "gtkobject" :depends-on ("defpackage" "gtk-alien" "libgtk-2.0"))

                 (:file "gtktypes" :depends-on ("gtkobject"))
                 (:file "gtkwidget" :depends-on ("gtktypes"))
                 (:file "gtkcontainer" :depends-on ("gtktypes"))
                 (:file "gtktypes" :depends-on ("gtkobject"))
                 (:file "gtkwidget" :depends-on ("gtktypes"))
                 (:file "gtkcontainer" :depends-on ("gtktypes"))