diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-05 11:08:32 +0200 |
|---|---|---|
| committer | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-05 13:50:13 +0200 |
| commit | 1c6e6671d106a45a0f30d5ca6427ebf0cc26abf5 (patch) | |
| tree | b0277def85ef03d272e2697aba39bf6090d16b9f | |
| parent | 503e3147485a8d21ec9915b5df4c2ba4e2c4284b (diff) | |
| download | glib-1c6e6671d106a45a0f30d5ca6427ebf0cc26abf5.tar.gz | |
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
| -rw-r--r-- | 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 894cf437a..cc7deb357 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 |