diff options
| author | Colin Walters <walters@verbum.org> | 2008-08-20 19:17:14 +0000 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-08-20 19:17:14 +0000 |
| commit | 76c461f297974edb65fee60752de53692fecb0e4 (patch) | |
| tree | df1e01ccea9ce61d6120018e1a1ff97e3eac2e02 /gir | |
| parent | ac59d7bac781df74236e1b801565d6b13a9e6433 (diff) | |
| download | gobject-introspection-76c461f297974edb65fee60752de53692fecb0e4.tar.gz | |
Rename .gir files using GI namespace. Use XDG_DATA_DIRS for looking up
2008-08-20 Colin Walters <walters@verbum.org>
* gir/Makefile.am: Rename .gir files using GI namespace.
* girepository/girepository.c: Use XDG_DATA_DIRS for
looking up typelibs. Also typelibs are now suffixed
with .typelib.
* tests/invoke/Makefile.am: Only use metadata.
* girepository/Makefile.am: Remove unnecessary include.
* tests/scanner/Makefile.am: Update using GI namespaces
for scanner includes.
svn path=/trunk/; revision=422
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/Makefile.am | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index 67757a8d..9a6b7a69 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -7,7 +7,7 @@ G_IR_SCANNER_FILES = $(top_srcdir)/giscanner/*.py \ # glib GLIB_INCLUDEDIR=`pkg-config --variable=includedir glib-2.0`/glib-2.0 GLIB_LIBDIR=`pkg-config --variable=libdir glib-2.0` -glib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) +GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) $(G_IR_SCANNER) -v --namespace GLib \ --noclosure \ --output $@ \ @@ -17,30 +17,29 @@ glib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) -DGETTEXT_PACKAGE=Dummy \ -D__G_I18N_LIB_H__ \ $(GLIB_INCLUDEDIR)/glib/*.h -BUILT_SOURCES += glib-2.0.gir +BUILT_SOURCES += GLib.gir # gobject GOBJECT_INCLUDEDIR=`pkg-config --variable=includedir gobject-2.0`/glib-2.0 GOBJECT_LIBDIR=`pkg-config --variable=libdir gobject-2.0` -gobject-2.0.gir: glib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) +GObject.gir: GLib.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) $(G_IR_SCANNER) -v --namespace GObject \ --noclosure \ --output $@ \ --strip-prefix=g \ - --include=$(builddir)/glib-2.0.gir \ + --include=$(builddir)/GLib.gir \ --library=$(GOBJECT_LIBDIR)/libgobject-2.0.so \ -I$(GOBJECT_INCLUDEDIR) \ -I$(GOBJECT_LIBDIR)/glib-2.0/include \ -DGOBJECT_COMPILATION \ --pkg glib-2.0 \ $(GLIB_INCLUDEDIR)/gobject/*.h -BUILT_SOURCES += gobject-2.0.gir -CLEANFILES = $(BUILT_SOURCES) +BUILT_SOURCES += GObject.gir # gio GIO_INCLUDEDIR=`pkg-config --variable=includedir gio-2.0`/glib-2.0 GIO_LIBDIR=`pkg-config --variable=libdir gio-2.0` -gio-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) +Gio.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) $(G_IR_SCANNER) -v --namespace Gio \ --noclosure \ --output $@ \ @@ -54,10 +53,16 @@ gio-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) --pkg glib-2.0 \ --pkg gobject-2.0 \ $(GLIB_INCLUDEDIR)/gio/*.h -BUILT_SOURCES += gio-2.0.gir +BUILT_SOURCES += Gio.gir CLEANFILES = $(BUILT_SOURCES) girdir=$(datadir)/gir dist_gir_DATA = $(BUILT_SOURCES) +%.typelib: %.gir + $(top_builddir)/tools/g-ir-compiler $< --raw -o $@ + +typelibsdir = $(datadir)/gitypelibs +typelibs_DATA = #Gio.typelib + EXTRA_DIST = glib-2.0-good.gir gobject-2.0-good.gir gobject-2.0-gio.gir |