From c0bc39e53c16a7e408b7bb0ecb13dc605f0b8ea4 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 14 Dec 2007 11:50:14 +0000 Subject: [PATCH] Shared object files given unique names Organization: Straylight/Edgeware From: espen --- gdk/gdk.asd | 24 ++++++++++++------------ gffi/gffi.asd | 5 +++-- glib/glib.asd | 22 +++++++++++----------- gtk/gtk.asd | 19 +++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gdk/gdk.asd b/gdk/gdk.asd index 2ac3c0b..a3fabc8 100644 --- 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" - :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" - :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")) diff --git a/gffi/gffi.asd b/gffi/gffi.asd index 72a5559..b19fdfd 100644 --- 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") - (: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 "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")) diff --git a/glib/glib.asd b/glib/glib.asd index 58ffaf7..5ed215e 100644 --- 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' - (: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-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" - :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")) - (: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")) diff --git a/gtk/gtk.asd b/gtk/gtk.asd index f56cde8..49de599 100644 --- 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" - :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")) -- [mdw]