Renamed ASDF systems {gtk,gdk,glib} to clgtk2-{gtk,gdk,glib}

diff --git a/gdk/clgtk2-gdk.asd b/gdk/clgtk2-gdk.asd
new file mode 100644 (file)
index 0000000..117deab
--- /dev/null
+++ b/gdk/clgtk2-gdk.asd
@@ -0,0 +1,9 @@
+(defsystem :clgtk2-gdk
+  :name :clgtk2-gdk
+  :author "Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>"
+  :license "LLGPL"
+  :serial t
+  :components ((:file "gdk.package")
+               (:file "gdk.objects")
+               (:file "gdk.functions"))
+  :depends-on (:clgtk2-glib :cffi))
\ No newline at end of file

diff --git a/gdk/gdk.asd b/gdk/gdk.asd
deleted file mode 100644 (file)
index fef78d1..0000000
--- a/gdk/gdk.asd
+++ /dev/null
@@ -1,7 +0,0 @@
-(defsystem :gdk
-  :name "gdk"
-  :serial t
-  :components ((:file "gdk.package")
-               (:file "gdk.objects")
-               (:file "gdk.functions"))
-  :depends-on (:glib :cffi))
\ No newline at end of file

diff --git a/glib/clgtk2-glib.asd b/glib/clgtk2-glib.asd
new file mode 100644 (file)
index 0000000..85f7ab5
--- /dev/null
+++ b/glib/clgtk2-glib.asd
@@ -0,0 +1,31 @@
+(defsystem :clgtk2-glib
+  :name :clgtk2-glib
+  :author "Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>"
+  :license "LLGPL"
+  :serial t
+  :components ((:file "glib")
+               (:file "glib.glist")
+               (:file "glib.gstrv")
+               (:file "glib.string")
+               (:file "glib.quark")
+               (:file "gobject.package")
+               (:file "gobject.structs")
+               (:file "gobject.type")
+               (:file "gobject.enum")
+               (:file "gobject.boxed")
+               (:file "gobject.gvalue")
+               (:file "gobject.gparams")
+               (:file "gobject.closures")
+               (:file "gobject.signals")
+               (:file "gobject.object")
+               (:file "gobject.foreign")
+               (:file "gobject.foreign-gobject")
+               (:file "gobject.foreign-closures")
+               (:file "gobject.foreign-gboxed")
+               (:file "gobject.gvalue-parser")
+               (:file "gobject.gobject-query")
+               (:file "gobject.meta")
+               (:file "gobject.generating")
+               (:file "gobject.object-defs")
+               (:file "gobject.foreign-gobject-subclassing"))
+  :depends-on (:cffi :trivial-garbage :iterate :bordeaux-threads :iterate :closer-mop))
\ No newline at end of file

diff --git a/glib/glib.asd b/glib/glib.asd
deleted file mode 100644 (file)
index 2454c44..0000000
--- a/glib/glib.asd
+++ /dev/null
@@ -1,30 +0,0 @@
-(defsystem :glib
-  :name "glib"
-  :author "Kalyanov Dmitry"
-  :serial t
-  :components ((:file "glib")
-               (:file "glib.glist")
-               (:file "glib.gstrv")
-               (:file "glib.string")
-               (:file "glib.quark")
-               (:file "gobject.package")
-               (:file "gobject.structs")
-               (:file "gobject.type")
-               (:file "gobject.enum")
-               (:file "gobject.boxed")
-               (:file "gobject.gvalue")
-               (:file "gobject.gparams")
-               (:file "gobject.closures")
-               (:file "gobject.signals")
-               (:file "gobject.object")
-               (:file "gobject.foreign")
-               (:file "gobject.foreign-gobject")
-               (:file "gobject.foreign-closures")
-               (:file "gobject.foreign-gboxed")
-               (:file "gobject.gvalue-parser")
-               (:file "gobject.gobject-query")
-               (:file "gobject.meta")
-               (:file "gobject.generating")
-               (:file "gobject.object-defs")
-               (:file "gobject.foreign-gobject-subclassing"))
-  :depends-on (:cffi :trivial-garbage :iterate :bordeaux-threads :iterate :closer-mop))
\ No newline at end of file

diff --git a/gtk/clgtk2-gtk.asd b/gtk/clgtk2-gtk.asd
new file mode 100644 (file)
index 0000000..3595ee2
--- /dev/null
+++ b/gtk/clgtk2-gtk.asd
@@ -0,0 +1,65 @@
+(defsystem :clgtk2-gtk
+  :name :clgtk2-gtk
+  :author "Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>"
+  :license "LLGPL"
+  :serial t
+  :components ((:file "gtk.package")
+               (:file "gtk.misc")
+               (:file "gtk.main_loop_events")
+               (:file "gtk.object")
+               (:file "gtk.objects")
+               (:file "gtk.generated-classes")               
+               (:file "gtk.functions")
+               (:file "gtk.base-classes")
+               (:file "gtk.dialog")
+               (:file "gtk.window")
+               (:file "gtk.image")
+               (:file "gtk.label")
+               (:file "gtk.progress-bar")
+               (:file "gtk.status-bar")
+               (:file "gtk.status-icon")
+               (:file "gtk.scale-button")
+               (:file "gtk.entry")
+               (:file "gtk.spin-button")
+               (:file "gtk.text")
+               (:file "gtk.tree-model")
+               (:file "gtk.tree-view-column")
+               (:file "gtk.tree-selection")
+               (:file "gtk.tree-view")
+               (:file "gtk.icon-view")
+               (:file "gtk.cell-layout")
+               (:file "gtk.cell-renderer")
+               (:file "gtk.combo-box")
+               (:file "gtk.menu")
+               (:file "gtk.ui-manager")
+               (:file "gtk.selectors")
+               (:file "gtk.layout-containers")
+               (:file "gtk.scrolling")
+               (:file "gtk.calendar")
+               (:file "gtk.size-group")
+               (:file "gtk.tooltip")
+               (:file "gtk.bin")
+               (:file "gtk.box")
+               (:file "gtk.container")
+               (:file "gtk.paned")
+               (:file "gtk.child-properties")
+               (:file "gtk.widget")
+               (:file "gtk.builder")
+
+               (:file "gtk.main-loop-events")
+               
+
+               (:file "gtk.generated-child-properties")
+               
+               (:file "gtk.high-level")
+
+               (:file "gtk.dialog.example")
+               
+               (:file "gtk.demo")
+               (:module "demo-files"
+                        :pathname "demo"
+                        :components ((:static-file "demo1.glade")
+                                     (:static-file "demo1.ui")
+                                     (:static-file "text-editor.glade")
+                                     (:static-file "text-editor.ui"))))
+  :depends-on (:clgtk2-glib :cffi :clgtk2-gdk :bordeaux-threads))
\ No newline at end of file

diff --git a/gtk/gtk.asd b/gtk/gtk.asd
deleted file mode 100644 (file)
index 0de4421..0000000
--- a/gtk/gtk.asd
+++ /dev/null
@@ -1,63 +0,0 @@
-(defsystem :gtk
-  :name "gtk"
-  :serial t
-  :components ((:file "gtk.package")
-               (:file "gtk.misc")
-               (:file "gtk.main_loop_events")
-               (:file "gtk.object")
-               (:file "gtk.objects")
-               (:file "gtk.generated-classes")               
-               (:file "gtk.functions")
-               (:file "gtk.base-classes")
-               (:file "gtk.dialog")
-               (:file "gtk.window")
-               (:file "gtk.image")
-               (:file "gtk.label")
-               (:file "gtk.progress-bar")
-               (:file "gtk.status-bar")
-               (:file "gtk.status-icon")
-               (:file "gtk.scale-button")
-               (:file "gtk.entry")
-               (:file "gtk.spin-button")
-               (:file "gtk.text")
-               (:file "gtk.tree-model")
-               (:file "gtk.tree-view-column")
-               (:file "gtk.tree-selection")
-               (:file "gtk.tree-view")
-               (:file "gtk.icon-view")
-               (:file "gtk.cell-layout")
-               (:file "gtk.cell-renderer")
-               (:file "gtk.combo-box")
-               (:file "gtk.menu")
-               (:file "gtk.ui-manager")
-               (:file "gtk.selectors")
-               (:file "gtk.layout-containers")
-               (:file "gtk.scrolling")
-               (:file "gtk.calendar")
-               (:file "gtk.size-group")
-               (:file "gtk.tooltip")
-               (:file "gtk.bin")
-               (:file "gtk.box")
-               (:file "gtk.container")
-               (:file "gtk.paned")
-               (:file "gtk.child-properties")
-               (:file "gtk.widget")
-               (:file "gtk.builder")
-
-               (:file "gtk.main-loop-events")
-               
-
-               (:file "gtk.generated-child-properties")
-               
-               (:file "gtk.high-level")
-
-               (:file "gtk.dialog.example")
-               
-               (:file "gtk.demo")
-               (:module "demo-files"
-                        :pathname "demo"
-                        :components ((:static-file "demo1.glade")
-                                     (:static-file "demo1.ui")
-                                     (:static-file "text-editor.glade")
-                                     (:static-file "text-editor.ui"))))
-  :depends-on (:glib :cffi :gdk :bordeaux-threads))
\ No newline at end of file

diff --git a/gtk/gtk.demo.lisp b/gtk/gtk.demo.lisp
index 8fe99b9..32410e7 100644 (file)
--- a/gtk/gtk.demo.lisp
+++ b/gtk/gtk.demo.lisp
@@ -26,7 +26,7 @@
 
 (in-package :gtk-demo)
 
-(defparameter *src-location* (asdf:component-pathname (asdf:find-system :gtk)))
+(defparameter *src-location* (asdf:component-pathname (asdf:find-system :clgtk2-gtk)))
 
 (defun test ()
   (within-main-loop