diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-01-11 15:25:47 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-01-11 15:25:47 +0100 |
| commit | 24d9f132340a18ca4368aede3367f5b917747acc (patch) | |
| tree | acfb593e640b3ad191991d49dfd0c6ac7a71a241 | |
| parent | 5d999862113fbc655429a0dd9bd7583ba3848434 (diff) | |
| download | gobject-introspection-24d9f132340a18ca4368aede3367f5b917747acc.tar.gz | |
tests: Fix build by including correct headers with --c-include
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 32c3522c..4ae351fe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -57,6 +57,7 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile --libtool="$(LIBTOOL)" \ --add-include-path=$(top_builddir) --include=Gio-2.0 \ --library=libgimarshallingtests-1.0.la --output=$@ \ + --c-include="tests/gimarshallingtests.h" \ $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c %.typelib: %.gir diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index a7dbc0a7..200120eb 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/common.mk include $(top_srcdir)/Makefile.introspection -INTROSPECTION_SCANNER_ARGS += --warn-all --warn-error +INTROSPECTION_SCANNER_ARGS += --warn-all --warn-error -I. # We need to build a shared library, which can be dlopened # it does not work with noinst_LTLIBRARIES @@ -56,6 +56,7 @@ Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir libregress.la Regress_1_0_gir_LIBS = libregress.la Regress_1_0_gir_INCLUDES = cairo-1.0 Gio-2.0 Regress_1_0_gir_FILES = $(libregress_la_SOURCES) +Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" if HAVE_CAIRO GIRS += Regress-1.0.gir endif @@ -65,6 +66,7 @@ Annotation_1_0_gir_PACKAGES = gobject-2.0 Annotation_1_0_gir_LIBS = libannotation.la Annotation_1_0_gir_INCLUDES = GObject-2.0 Utility-1.0 Annotation_1_0_gir_FILES = $(libannotation_la_SOURCES) +Annotation_1_0_gir_SCANNERFLAGS = --c-include="annotation.h" GIRS += Annotation-1.0.gir TestInherit-1.0.gir: Utility-1.0.gir libtestinherit.la @@ -72,6 +74,7 @@ TestInherit_1_0_gir_PACKAGES = gobject-2.0 TestInherit_1_0_gir_LIBS = libtestinherit.la TestInherit_1_0_gir_INCLUDES = GObject-2.0 Utility-1.0 TestInherit_1_0_gir_FILES = $(libtestinherit_la_SOURCES) +TestInherit_1_0_gir_SCANNERFLAGS = --c-include="drawable.h" GIRS += TestInherit-1.0.gir Foo-1.0.gir: Utility-1.0.gir libfoo.la @@ -87,6 +90,7 @@ Utility_1_0_gir_PACKAGES = gobject-2.0 Utility_1_0_gir_LIBS = libutility.la Utility_1_0_gir_INCLUDES = GObject-2.0 Utility_1_0_gir_FILES = $(libutility_la_SOURCES) +Utility_1_0_gir_SCANNERFLAGS = --c-include="utility.h" GIRS += Utility-1.0.gir # This one tests different --namespace and --strip-prefix |