Commit f7643a7d authored by Emmanuele Bassi's avatar Emmanuele Bassi

Re-enable signal tests when cross-compiling

The glib-genmarshal tool has been rewritten in Python, which means we
can run it when cross-compiling.

https://bugzilla.gnome.org/show_bug.cgi?id=784528
parent 93f16a45
......@@ -35,8 +35,7 @@ ifaceproperties_SOURCES = ifaceproperties.c testcommon.h
# The marshalers test requires running a binary, so we cannot build it when
# cross-compiling
if !CROSS_COMPILING
glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
glib_genmarshal = $(top_builddir)/gobject/glib-genmarshal
test_programs += signals
signals_SOURCES = signals.c
......@@ -45,10 +44,21 @@ signals.o: marshalers.h
CLEANFILES += marshalers.h marshalers.c
EXTRA_DIST += marshalers.list
marshalers.h: Makefile.am marshalers.list
$(AM_V_GEN) $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --header --valist-marshallers > marshalers.h
marshalers.h: $(srcdir)/marshalers.list Makefile.am
$(AM_V_GEN) $(glib_genmarshal) \
--prefix=test \
--valist-marshallers \
--output=$@ \
--quiet \
--header \
$<
marshalers.c: Makefile.am marshalers.h marshalers.list
$(AM_V_GEN) (echo "#include \"marshalers.h\""; $(glib_genmarshal) --prefix=test $(srcdir)/marshalers.list --body --valist-marshallers) > $@.tmp && mv $@.tmp $@
endif # !CROSS_COMPILING
marshalers.c: $(srcdir)/marshalers.list marshalers.h Makefile.am
$(AM_V_GEN) $(glib_genmarshal) \
--prefix=test \
--valist-marshallers \
--include-header=marshalers.h \
--output=$@ \
--quiet \
--body \
$<
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment