X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/cea43e54e89c50cf290232826d8f8b3d3fc3fbb6..17707159d8c21693d69ab2230b41854da48e0e87:/gtk/gtk.asd?ds=sidebyside

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
index db9ae6c..66926bc 100644
--- a/gtk/gtk.asd
+++ b/gtk/gtk.asd
@@ -3,13 +3,14 @@
 (asdf:oos 'asdf:load-op :clg-tools)
 
 (defpackage "GTK-SYSTEM"
-  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG")
-  (:export "CLG-INIT"))
+  (:use "COMMON-LISP" "ASDF" "PKG-CONFIG"))
 
 (in-package "GTK-SYSTEM")
 
 (pkg-exists-p "gtk+-2.0" :atleast-version "2.4.0")
 
+(when (string>= (pkg-version "gtk+-2.0") "2.6.0")
+  (pushnew :gtk2.6 *features*))
 
 (defsystem gtk
     :depends-on (glib gdk pango atk)
@@ -25,7 +26,10 @@
  		 (:file "gtktypes" :depends-on ("gtkobject"))
 		 (:file "gtkwidget" :depends-on ("gtktypes"))
 		 (:file "gtkcontainer" :depends-on ("gtktypes"))
+		 (:file "gtktree" :depends-on ("gtktypes"))
+		 (:file "gtktext" :depends-on ("gtktypes"))
+		 (:file "gtkaction" :depends-on ("gtktypes"))
+		 (:file "gtkstyle" :depends-on ("gtktypes"))
 		 (:file "gtk" :depends-on ("gtktypes"))
 		 (:file "gtkutils" :depends-on ("gtk"))
-		 (:file "export" :depends-on ("gtktypes" "gtk")))
-    :perform (load-op :after (op gtk) (clg-init)))
+		 (:file "export" :depends-on ("gtktypes" "gtkwidget" "gtkcontainer" "gtk" "gtktree" "gtkaction" "gtkutils" "gtkstyle"))))