From 41e22ab5927c1196e7f62cf875d6b0a9f64c7552 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 11 Jul 2017 11:30:08 +0100 Subject: [PATCH] Use newer glib-genmarshal option When building against a glib-genmarshal from GLib 2.54 we can use the `--prototypes` command line argument to generate the prototypes for the marshallers in the C source, and avoid a missing-prototypes compiler warning. --- clutter/clutter/Makefile.am.marshal | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clutter/clutter/Makefile.am.marshal b/clutter/clutter/Makefile.am.marshal index f29629ce1..084dc5543 100644 --- a/clutter/clutter/Makefile.am.marshal +++ b/clutter/clutter/Makefile.am.marshal @@ -34,6 +34,7 @@ stamp-marshal: $(marshal_list) $(AM_V_GEN)$(GLIB_GENMARSHAL) \ --prefix=$(glib_marshal_prefix) \ --header \ + --valist-marshallers \ $(marshal_list) > xgen-mh \ && (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \ && rm -f xgen-mh \ @@ -46,6 +47,8 @@ $(marshal_c): $(marshal_h) $(AM_V_GEN)$(GLIB_GENMARSHAL) \ --prefix=$(glib_marshal_prefix) \ --body \ + --valist-marshallers \ + --prototypes \ $(marshal_list) > xgen-mc \ && (cmp -s xgen-mc $(marshal_c) || cp -f xgen-mc $(marshal_c)) \ && rm -f xgen-mc