[gtk+/gtk-3-22] build: Don't include the marshallers header file

[Emmanuele Bassi <ebassi src gnome org>]

commit d9e0ea2905cb9f458a15b6192c67fe30da7ad1c3
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 28 21:50:41 2017 +0100

    build: Don't include the marshallers header file
    
    We used to inject the inclusion of the generated header file into the
    generated body of the marshallers source code in order to avoid compiler
    warnings about missing prototypes. The glib-genmarshal utility has been
    fixed in GLib to include the prototype in the generated source, so now
    we're going to trip -Werror=redundant-decls.

 gdk/Makefile.am |   11 ++++++++---
 gtk/Makefile.am |   14 ++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 35dc661..573b197 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -440,12 +440,17 @@ gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
 # Marshaller generation
 #
 gdkmarshalers.h: gdkmarshalers.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > 
gdkmarshalers-h.tmp \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) \
+               --prefix=_gdk_marshal \
+               --header \
+               $(srcdir)/gdkmarshalers.list > gdkmarshalers-h.tmp \
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: gdkmarshalers.list
-       $(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \
-        $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp  
  \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) \
+               --prefix=_gdk_marshal \
+               --body \
+               $(srcdir)/gdkmarshalers.list > gdkmarshalers-c.tmp      \
        && mv gdkmarshalers-c.tmp gdkmarshalers.c \
        || ( rm -f gdkmarshalers-c.tmp && exit 1 )
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c601ad2..316dd25 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1227,14 +1227,20 @@ BUILT_SOURCES = \
 gtkmarshalers.h: stamp-gtkmarshalers.h
        @true
 stamp-gtkmarshalers.h: gtkmarshalers.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --header 
--valist-marshallers >> xgen-gmlh \
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) \
+               --prefix=_gtk_marshal \
+               --header \
+               --valist-marshallers \
+               $(srcdir)/gtkmarshalers.list >> xgen-gmlh \
        && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
        && rm -f xgen-gmlh \
        && echo timestamp > $(@F)
 gtkmarshalers.c: gtkmarshalers.list
-       $(AM_V_GEN) (echo "#include \"gtkmarshalers.h\""; \
-        echo "#undef G_ENABLE_DEBUG"; \
-        $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body  --valist-marshallers) 
> > xgen-gmlc \
+       $(AM_V_GEN) (echo "#undef G_ENABLE_DEBUG"; \
+        $(GLIB_GENMARSHAL) \
+               --prefix=_gtk_marshal \
+               --body \
+               --valist-marshallers $(srcdir)/gtkmarshalers.list) >> xgen-gmlc \
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc