summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC. Scott Ananian <cscott@litl.com>2009-06-15 16:48:12 -0400
committerC. Scott Ananian <cscott@litl.com>2009-06-16 10:22:24 -0400
commitc8ab894d26b8d41ae25be8eaeaf57dc2babe8a2f (patch)
tree903c66ff8f90bfa77046b91268d3013e7487b0c3
parentc69de26ab29a947cfe939f9e9e3c38fdd00e0599 (diff)
downloadgobject-introspection-c8ab894d26b8d41ae25be8eaeaf57dc2babe8a2f.tar.gz
Bug 585579: actually check Everything-1.0-expected.gir
As discussed in bug 585908, we also rename CHECKGIRS and EXPECTEDGIRS to match the naming in tests/scanner/Makefile.am.
-rw-r--r--gir/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am
index aee2262c..eece8ece 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/common.mk
-CHECKGIRS =
+EXPECTEDGIRS =
BUILT_GIRSOURCES =
CLEANFILES =
EXTRA_DIST =
@@ -192,7 +192,7 @@ Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.
$(srcdir)/everything.h $(srcdir)/everything.c \
--output $@
BUILT_GIRSOURCES += Everything-$(TYPELIB_VERSION).gir
-CHECKGIRS += Everything-$(TYPELIB_VERSION)-expected.gir
+EXPECTEDGIRS += Everything-$(TYPELIB_VERSION)-expected.gir
# Generic rules
CLEANFILES += $(BUILT_GIRSOURCES)
@@ -215,6 +215,7 @@ CLEANFILES += $(typelibs_DATA)
%.gir.check: %.gir
@diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo " TEST $*.gir"
+CHECKGIRS = $(EXPECTEDGIRS:-expected.gir=.gir.check)
check-local: $(CHECKGIRS)
# Check that typelib -> gir -> typelib transformation is lossless.
@@ -238,4 +239,4 @@ CLEANFILES += $(typelibs_DATA:%.typelib=%.test.typelib)
#check-local: $(typelibs_DATA:%.typelib=testlib-%)
check-gir: $(typelibs_DATA:%.typelib=testgir-%)
-EXTRA_DIST += $(CHECKGIRS)
+EXTRA_DIST += $(EXPECTEDGIRS)