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.
## 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
AM_CHECK_PYTHON_HEADERS
AC_CONFIG_FILES([Makefile
- gidl/Makefile
+ gir/Makefile
girepository/Makefile
giscanner/Makefile
m4/Makefile
+++ /dev/null
-gidldir = $(datadir)/gidl
-dist_gidl_DATA = gobject-2.0.gidl
+++ /dev/null
-<?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>
--- /dev/null
+girdir = $(datadir)/gir
+dist_gir_DATA = gobject-2.0.gir
--- /dev/null
+<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>
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 \
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 $@