[gnome-terminal/gnome-3-26] build: Don't call glib-genmarshal with both --header and --body



commit 22c189b69f3aa1772da2fe4c4075cc3880dafe6f
Author: Christian Persch <chpe src gnome org>
Date:   Mon Oct 30 22:55:59 2017 +0100

    build: Don't call glib-genmarshal with both --header and --body
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788031
    (cherry picked from commit 0ea635f3dec365e22bf9a35313e28ca2cedbd563)

 src/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index aa63b7b..c024ffa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,10 +135,10 @@ terminal-marshal.h: $(srcdir)/terminal-marshal.list
        || ( rm -f terminal-marshal.h.tmp && exit 1 )
 
 terminal-marshal.c: $(srcdir)/terminal-marshal.list
-       $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=_terminal_marshal $(srcdir)/terminal-marshal.list \
-                               --header \
+       $(AM_V_GEN) ( echo '#include "terminal-marshal.h"' > terminal-marshal.c.tmp  && \
+                     $(GLIB_GENMARSHAL) --prefix=_terminal_marshal $(srcdir)/terminal-marshal.list \
                                --body \
-                               --internal > terminal-marshal.c.tmp \
+                               --internal >> terminal-marshal.c.tmp \
                && mv terminal-marshal.c.tmp terminal-marshal.c ) \
        || ( rm -f terminal-marshal.c.tmp && exit 1 )
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]