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 /tests/Makefile.am | |
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 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 57e07873..2d806b22 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,6 @@ EXTRA_DIST = \ enum.gir \ errors.gir \ function.gir \ - gobject.gir \ interface.gir \ object.gir \ struct.gir \ @@ -20,15 +19,15 @@ GIRTESTS = \ boxed.gir.test \ constant.gir.test \ enum.gir.test \ - gobject.gir.test \ object.gir.test \ struct.gir.test -%.gir.test: %.gir +%.gir.test: %.gir Makefile @echo Testing $<: - $(DEBUG) $(top_builddir)/tools/g-ir-compiler $< > $*.1; \ - $(DEBUG) $(top_builddir)/tools/g-ir-generate $*.1 > $*.2; \ - diff -u $< $*.2; rm $*.1 $*.2 + $(DEBUG) $(top_builddir)/tools/g-ir-compiler --includedir=$(top_builddir)/gir $< > $*.1; \ + $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=$(top_builddir)/gir $*.1 > $*.2; \ + diff -u $*.1 $*.2; rm $*.1 $*.2 + check-local: $(GIRTESTS) @echo Running PEP8 on Python sources |