diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-04-28 21:50:41 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-04-28 21:50:41 +0100 |
| commit | 4724a89022ef1bec93b1a42d4cf2fec7191ed712 (patch) | |
| tree | 01178e4039eb4c791da39220e8c4abfde7a479a9 /gtk/Makefile.am | |
| parent | bb1deaafa42ccb03929d3cd5fdab685218bbac29 (diff) | |
| download | gtk+-4724a89022ef1bec93b1a42d4cf2fec7191ed712.tar.gz | |
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.
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index df660307e8..3d5745cf2b 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1193,14 +1193,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 |