Generate marshallers without including the generated header

GLib now generates the prototypes for the generated marshallers, so it's
not necessary to include the header any more.

This fixes a build failure in GNOME Continuous with GLib master, caused
by -Werror=redundant-decls.
This commit is contained in:
Emmanuele Bassi 2017-04-30 14:55:20 +01:00
parent 8ed0dda40d
commit 9131f26cae

View File

@ -43,10 +43,9 @@ $(marshal_h): stamp-marshal
@true @true
$(marshal_c): $(marshal_h) $(marshal_c): $(marshal_h)
$(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \ $(AM_V_GEN)$(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) \
--prefix=$(glib_marshal_prefix) \ --prefix=$(glib_marshal_prefix) \
--body \ --body \
$(marshal_list)) > xgen-mc \ $(marshal_list) > xgen-mc \
&& cp xgen-mc $(marshal_c) \ && (cmp -s xgen-mc $(marshal_c) || cp -f xgen-mc $(marshal_c)) \
&& rm -f xgen-mc && rm -f xgen-mc