[glib/glib-2-46] gio/tests: Don't depend on a data file that's not built
- From: Jussi Kukkonen <jussik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-46] gio/tests: Don't depend on a data file that's not built
- Date: Thu, 5 Nov 2015 11:56:11 +0000 (UTC)
commit 7b9f2509cedb828b20dab9d5901b178220303e94
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date: Thu Nov 5 11:08:32 2015 +0200
gio/tests: Don't depend on a data file that's not built
data.gresource is not built when cross-compiling: Don't
add it to test_data in that case.
https://bugzilla.gnome.org/show_bug.cgi?id=757628
gio/tests/Makefile.am | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 894cf43..cc7deb3 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -76,7 +76,6 @@ dist_test_data = \
$(NULL)
test_data = \
- test.gresource \
$(NULL)
uninstalled_test_extra_programs = \
@@ -520,6 +519,8 @@ libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c
libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined)
libresourceplugin_la_LIBADD = $(LDADD)
+test_data += test.gresource
+
# libtool contains a bug whereby the created .la file doesn't contain the correct dlname='' in the case that
# you're building a library but not installing it. This is apparently because the only considered use for an
# uninstalled library is as a convenience library for linking (despite the fact that we give -module). The
lack
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]