Replace the GObject gidl with a GObject gir.

2008-04-27  Johan Dahlin  <johan@gnome.org>

        * Makefile.am:
        * configure.ac:
        * gidl/Makefile.am:
        * gidl/gobject-2.0.gidl:
        * gir/Makefile.am:
        * gir/gobject-2.0.gir:
        * tests/parser/Makefile.am:
        Replace the GObject gidl with a GObject gir.


svn path=/trunk/; revision=241

8 files changed, 34 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 52fbdca1..057a34db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-04-27  Johan Dahlin  <johan@gnome.org>
 
+	* Makefile.am:
+	* configure.ac:
+	* gidl/Makefile.am:
+	* gidl/gobject-2.0.gidl:
+	* gir/Makefile.am:
+	* gir/gobject-2.0.gir:
+	* tests/parser/Makefile.am:
+	Replace the GObject gidl with a GObject gir.
+
+2008-04-27  Johan Dahlin  <johan@gnome.org>
+
 	* tools/Makefile.am (bin_SCRIPTS): g-ir-scanner is a script,
 	not a program.
 
diff --git a/Makefile.am b/Makefile.am
index 32d16280..b064a57a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gidl girepository giscanner tools tests
+SUBDIRS = gir girepository giscanner tools tests
 DIST_SUBDIRS = m4 $(SUBDIRS)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 6dcdb516..e691cf51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ AM_PATH_PYTHON([2.5])
 AM_CHECK_PYTHON_HEADERS
 
 AC_CONFIG_FILES([Makefile
-                 gidl/Makefile
+                 gir/Makefile
                  girepository/Makefile
                  giscanner/Makefile
                  m4/Makefile
diff --git a/gidl/Makefile.am b/gidl/Makefile.am
deleted file mode 100644
index 585850db..00000000
--- a/gidl/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-gidldir = $(datadir)/gidl
-dist_gidl_DATA = gobject-2.0.gidl
diff --git a/gidl/gobject-2.0.gidl b/gidl/gobject-2.0.gidl
deleted file mode 100644
index a63ecc8a..00000000
--- a/gidl/gobject-2.0.gidl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE api SYSTEM "gidl.dtd">
-<api version="1.0">
-  <namespace name="GLib">
-    <object name="Object" type-name="GObject" get-type="internal">
-    </object>
-    <object name="InitiallyUnowned" type-name="GInitiallyUnowned" get-type="g_initially_unowned_get_type">
-    </object>
-  </namespace>
-</api>
diff --git a/gir/Makefile.am b/gir/Makefile.am
new file mode 100644
index 00000000..dce5152e
--- /dev/null
+++ b/gir/Makefile.am
@@ -0,0 +1,2 @@
+girdir = $(datadir)/gir
+dist_gir_DATA = gobject-2.0.gir
diff --git a/gir/gobject-2.0.gir b/gir/gobject-2.0.gir
new file mode 100644
index 00000000..4fbd2c86
--- /dev/null
+++ b/gir/gobject-2.0.gir
@@ -0,0 +1,15 @@
+<repository version="1.0"
+            xmlns="http://www.gtk.org/introspection/core/1.0"
+            xmlns:c="http://www.gtk.org/introspection/c/1.0"
+            xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+  <namespace name="GLib">
+    <class name="Object"
+           glib:type-name="GObject"
+           glib:get-type="intern">
+    </class>
+    <class name="InitiallyUnowned"
+           glib:type-name="GInitiallyUnowned"
+           glib:get-type="g_initially_unowned_get_type">
+    </class>
+  </namespace>
+</repository>
diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index 69a2bf79..daf4c5af 100644
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -16,9 +16,10 @@ CLEANFILES = utility.gir Foo.gir
 EXTRA_DIST = utility-expected.gir Foo-expected.gir 
 
 SCANNER = $(top_builddir)/tools/g-ir-scanner
+
 utility.gir: libutility.la utility.h $(SCANNER)
 	@PYTHONPATH=$(top_srcdir) $(SCANNER) -v \
-	--include=$(top_srcdir)/gidl/gobject-2.0.gidl \
+	--include=$(top_srcdir)/gir/gobject-2.0.gir \
 	--library=libutility.la \
 	--namespace=utility \
 	--pkg gobject-2.0 \
@@ -26,10 +27,10 @@ utility.gir: libutility.la utility.h $(SCANNER)
 
 Foo.gir: libfoo.la foo-object.h $(SCANNER)
 	@PYTHONPATH=$(top_srcdir) $(SCANNER) -v \
-	--include=$(top_srcdir)/gidl/gobject-2.0.gidl \
+	--include=$(top_srcdir)/gir/gobject-2.0.gir \
 	--include=$(srcdir)/utility.gir \
-	--namespace=Foo \
 	--library=libfoo.la \
+	--namespace=Foo \
 	--pkg gobject-2.0 \
 	$(libfoo_la_SOURCES) \
 	 --output $@