luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-11 05:13:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio/tests: Don't depend on a data file that's not built

Browse Source 
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
This commit is contained in:
Jussi Kukkonen 2015-11-05 11:08:32 +02:00
parent 9fa97b3558
commit 7b9f2509ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/tests/Makefile.am
View File

@ -76,7 +76,6 @@ dist_test_data = \
$(NULL) $(NULL)
test_data = \ test_data = \
test.gresource \
$(NULL) $(NULL)
uninstalled_test_extra_programs = \ 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_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined)
libresourceplugin_la_LIBADD = $(LDADD) 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 # 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 # 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 # uninstalled library is as a convenience library for linking (despite the fact that we give -module). The lack