diff options
| author | Tommi Komulainen <tko@src.gnome.org> | 2008-10-29 10:13:16 +0000 |
|---|---|---|
| committer | Tommi Komulainen <tko@src.gnome.org> | 2008-10-29 10:13:16 +0000 |
| commit | bd43e74b090661afd51fed809092a26168b49e97 (patch) | |
| tree | 3517e7393aa667dfd5470036512d6dc8b90a48f4 /tests | |
| parent | eea9270e454efe26376bf4ad3336cc1fd696c35f (diff) | |
| download | gobject-introspection-bd43e74b090661afd51fed809092a26168b49e97.tar.gz | |
distcheck fixes
* gir/Makefile.am:
* tests/Makefile.am:
* tests/invoke/Makefile.am:
* tests/scanner/Makefile.am: Add missing files to EXTRA_DIST and
CLEANFILES, reference files using $(srcdir)
svn path=/trunk/; revision=823
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/invoke/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index f5cbed35..a6e8c9e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,7 @@ CLEANFILES = $(GIRTESTS:%.gir.test=%.1) $(GIRTESTS:%.gir.test=%.2) @echo Testing $<: $(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 $*.gir $*.2 && rm $*.1 $*.2 + diff -u $(srcdir)/$*.gir $*.2 && rm $*.1 $*.2 check-local: $(GIRTESTS) diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am index df72f256..7f8801f3 100644 --- a/tests/invoke/Makefile.am +++ b/tests/invoke/Makefile.am @@ -29,5 +29,5 @@ invoke_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la TESTS = invoke invoke-namespace-find.sh -EXTRA_DIST = invoke-namespace-find.sh testfns.gir +EXTRA_DIST = invoke-namespace-find.sh testfns-1.0.gir diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index cae256f8..cc5817c8 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -32,9 +32,10 @@ SCANNER_LIBS = \ TYPELIBS = $(GIRS:.gir=.typelib) CHECKGIRS = $(GIRS:.gir=.gir.check) EXPECTEDGIRS = $(GIRS:.gir=-expected.gir) +TGIRS = $(GIRS:.gir=.tgir) CHECKTGIRS = $(GIRS:.gir=.tgir.check) EXPECTEDTGIRS = $(GIRS:.gir=-expected.tgir) -CLEANFILES = $(TYPELIBS) $(GIRS) +CLEANFILES = $(TYPELIBS) $(GIRS) $(TGIRS) BUILT_SOURCES = $(TYPELIBS) $(GIRS) EXTRA_DIST = $(EXPECTEDGIRS) $(EXPECTEDTGIRS) @@ -66,8 +67,9 @@ GIRS += drawable-1.0.gir drawable-injected-1.0.gir: drawable-1.0.gir $(SCANNER) $(SCANNER_LIBS) Makefile PYTHONPATH=$(top_builddir):$$PYTHONPATH $(CHECK_DEBUG) $(SCANNER) -v \ - --inject drawable-1.0.gir DrawableAdditions.xml $@ + --inject drawable-1.0.gir $(srcdir)/DrawableAdditions.xml $@ GIRS += drawable-injected-1.0.gir +EXTRA_DIST += DrawableAdditions.xml foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(SCANNER) $(SCANNER_LIBS) Makefile PYTHONPATH=$(top_builddir):$$PYTHONPATH $(CHECK_DEBUG) $(SCANNER) -v \ @@ -140,6 +142,6 @@ check-local: $(CHECKGIRS) $(CHECKTGIRS) $(TYPELIBS) echo 1>&2 "$(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml;"; \ $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \ done -CLEANFILES += $(TYPELIBS:.typelib:.typelib.xml) +CLEANFILES += $(TYPELIBS:.typelib=.typelib.xml) check-local: post-check |