Defsystem cleanups

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
index c70f8961b85cff26824276ff590a661517a07872..a2d7f568cbec4ea48563a736a2054c81f3f3fd95 100644 (file)
--- a/gdk/gdk.asd
+++ b/gdk/gdk.asd
@@ -5,22 +5,25 @@
 
 (in-package "GDK-SYSTEM")
 
 
 (in-package "GDK-SYSTEM")
 

-(pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0" :error t)
+(pkg-exists-p "gdk-2.0" :atleast-version "2.4.0" :error t)

 
 (defsystem gdk
 
 (defsystem gdk

-    :depends-on (gffi glib pango #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.8.0") cairo)
+    :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" 
     :components ((:file "defpackage")
                 (:library "libgdk_pixbuf-2.0" 

-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
-                (:library "libgdk-x11-2.0" 
-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
+                          :libdir #.(pkg-variable "gdk-2.0" "libdir"))
+                (:library "libgdk-2.0" 
+                          :libdir #.(pkg-variable "gdk-2.0" "libdir")
+                          :libname #-win32 "libgdk-x11-2.0"
+                                   #+win32 "libgdk-win32-2.0-0")

                 (:unix-dso "alien"
                 (:unix-dso "alien"

-                           :ldflags #.(pkg-libs "gtk+-2.0")
+                           :ldflags #.(pkg-libs "gdk-2.0")

                            :components ((:c-source-file "glue"
                            :components ((:c-source-file "glue"

-                                         :cflags #.(pkg-cflags "gtk+-2.0"))))
+                                         :cflags #.(pkg-cflags "gdk-2.0")))
+                           :depends-on (#+cmu "libgdk-2.0"))

                 (:file "gdktypes" :depends-on ("defpackage" "alien" 
                                                "libgdk_pixbuf-2.0" 
                 (:file "gdktypes" :depends-on ("defpackage" "alien" 
                                                "libgdk_pixbuf-2.0" 

-                                               "libgdk-x11-2.0"))
+                                               "libgdk-2.0"))

                 (:file "gdkevents" :depends-on ("gdktypes"))
                 (:file "pixbuf" :depends-on ("gdktypes"))
                 (:file "gdk" :depends-on ("gdkevents"))
                 (:file "gdkevents" :depends-on ("gdktypes"))
                 (:file "pixbuf" :depends-on ("gdktypes"))
                 (:file "gdk" :depends-on ("gdkevents"))

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index c2e15a79700bb4df52359f3ddb794d1eea06102a..e3b31a0d887fbb68efb71869163c71bc7cbe5509 100644 (file)
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -12,16 +12,17 @@
 (defsystem gtk
     :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")
 (defsystem gtk
     :depends-on (gffi glib gdk pango atk)
     :components ((:file "defpackage")

-                (:library "libgtk-x11-2.0" 
-                          :libdir #.(pkg-variable "gtk+-2.0" "libdir"))
+                (:library "libgtk-2.0" 
+                          :libdir #.(pkg-variable "gtk+-2.0" "libdir")
+                          :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")))
                 (:unix-dso "alien"
                            :ldflags #.(pkg-libs "gtk+-2.0")
                            :components ((:c-source-file "glue"
                                          :cflags #.(pkg-cflags "gtk+-2.0")))

-;                          :depends-on ("libgtk-x11-2.0")
-                           )
+                           :depends-on (#+cmu "libgtk-2.0"))

                 (:file "gtkobject" 
                 (:file "gtkobject" 

-                       :depends-on ("defpackage" "alien"))
+                       :depends-on ("defpackage" "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"))