Defsystem cleanups

[clg] / gtk / gtk.asd

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")
-                (: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")))
-;                          :depends-on ("libgtk-x11-2.0")
-                           )
+                           :depends-on (#+cmu "libgtk-2.0"))
                 (: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"))