[glib] Re-enable signal tests when cross-compiling

[Emmanuele Bassi <ebassi src gnome org>]

commit f7643a7df750684c97aaef8b3fbf66fcc2661e84
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 5 17:10:08 2017 +0100

    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

 gobject/tests/Makefile.am |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index da36e19..1cad19c 100644
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -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 \
+               $<