[vte] Fix the generation of the signal marshallers

[Emmanuele Bassi <ebassi src gnome org>]

commit fa3bc86008cfe517dbb05deb4dff0059f3749c95
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 12 17:05:24 2017 +0100

    Fix the generation of the signal marshallers
    
    The generation of the signal marshallers is based on an undefined
    behaviour of the glib-genmarshal tool. Passing both the --header and
    --body command line arguments is undocumented and untested behaviour.
    The generated C source adds prototypes for the marshallers, and wraps
    the whole file between C++ guards.
    
    Instead of relying on undocumented behaviour, we can achieve the same
    result by including the generated header in the generated source.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784853

 src/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index a1120cc..21acac6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -151,7 +151,8 @@ box_drawing.h: box_drawing.txt box_drawing_generate.sh
        $(AM_V_GEN) $(srcdir)/box_drawing_generate.sh < $< > $@
 
 marshal.cc: marshal.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --body --internal $< > $@
+       $(AM_V_GEN) echo '#include "marshal.h"' > $@ \
+       && $(GLIB_GENMARSHAL) --prefix=_vte_marshal --body --internal $< >> $@
 
 marshal.h: marshal.list
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --internal $< > $@