diff options
| author | Colin Walters <walters@src.gnome.org> | 2008-08-30 20:31:07 +0000 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-08-30 20:31:07 +0000 |
| commit | 8e9b9ce60747b262e3e9c4be4ae85ee1319ae3f4 (patch) | |
| tree | 1ddd59b84d74350c3b3afbf7df2092bfc001f053 /gir | |
| parent | 3be5f52707d68d0fb02f4415dc90450aa64ffea1 (diff) | |
| download | gobject-introspection-8e9b9ce60747b262e3e9c4be4ae85ee1319ae3f4.tar.gz | |
Put dependencies in typelibs, resolve them when loading
* gir/Makefile.am: Dep on Makefile
* girepository/ginfo.c: Print out a nicer error
message if we failed to load something.
* girepository/girepository.c: Clean up
default typelib handling; remove global
default_typelib variable. Ensure we handle
NULL repository in more places.
Support dependency resolution.
* tests/Makefile.am: Kill off gobject.gir,
it conflicts with the real one.
* tests/Object.gir: Depend on GObject.
* tools/generate.c: Take --includedir
argument to say which directories to search
for typelibs. Print out dependencies.
svn path=/trunk/; revision=541
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index acd4c9de..6747641d 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -14,8 +14,8 @@ else GLIB_LIBRARY=glib-2.0 endif -GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ +GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile + PYTHONPATH=$(top_srcdir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace GLib \ --noclosure \ --output $@ \ @@ -40,8 +40,8 @@ else GOBJECT_LIBRARY=gobject-2.0 endif -GObject.gir: GLib.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ +GObject.gir: GLib.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile + PYTHONPATH=$(top_srcdir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace GObject \ --noclosure \ --output $@ \ @@ -65,8 +65,8 @@ else GIO_LIBRARY=gio-2.0 endif -Gio.gir: GObject.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ +Gio.gir: GObject.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile + PYTHONPATH=$(top_srcdir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace Gio \ --noclosure \ --output $@ \ |