[pygobject] tests: use g-ir utils found by pkg-config
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] tests: use g-ir utils found by pkg-config
- Date: Mon, 20 Mar 2017 16:35:12 +0000 (UTC)
commit 2c329edb870787be1db4d5ecafdf221bead8b271
Author: Mikhail Fludkov <misha pexip com>
Date: Fri Oct 14 18:36:21 2016 +0200
tests: use g-ir utils found by pkg-config
Use g-ir utils found by pkg-config to not fail if gobject-introspection is not installed systemwide
https://bugzilla.gnome.org/show_bug.cgi?id=772949
tests/Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8f352bb..e660382 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,7 @@ libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshalling
$(AM_V_GEN) $(LINK) -rpath $(pkgpyexecdir) $(libgimarshallingtests_la_LDFLAGS)
$(libgimarshallingtests_la_OBJECTS) $(libgimarhallingtests_la_LIBADD) $(LIBS)
GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
- $(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) --include=Gio-2.0 \
--namespace=GIMarshallingTests --nsversion=1.0 --symbol-prefix=gi_marshalling_tests \
--warn-all --warn-error \
--library=libgimarshallingtests.la \
@@ -29,7 +29,7 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
$(dist_libgimarshallingtests_la_SOURCES)
GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
- $(AM_V_GEN) g-ir-compiler $< -o $@
+ $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
# regress.c needs cairo
if ENABLE_CAIRO
@@ -45,7 +45,7 @@ libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES)
# g-i doesn't ship these as shared libraries anymore; we build them here
Regress-1.0.gir: libregress.la Makefile
- $(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \
+ $(AM_V_GEN) $(INTROSPECTION_SCANNER) --include=cairo-1.0 --include=Gio-2.0 \
--namespace=Regress --nsversion=1.0 \
--warn-all --warn-error \
--library=libregress.la \
@@ -53,7 +53,7 @@ Regress-1.0.gir: libregress.la Makefile
--output $@ \
$(nodist_libregress_la_SOURCES)
Regress-1.0.typelib: Regress-1.0.gir Makefile
- $(AM_V_GEN) g-ir-compiler $< -o $@
+ $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
endif # ENABLE_CAIRO
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]