summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-02-03 08:49:20 +0100
committerraveit65 <[email protected]>2020-02-06 14:08:29 +0100
commit0ac9d0c1375e3c36a7cd07ece1fc8fbaabd56213 (patch)
tree7403738bca7432639b18e30c0240c33b01327d3d
parentbe61ed39acc8dcabd154d785d7c989739ac085c7 (diff)
downloadmate-control-center-0ac9d0c1375e3c36a7cd07ece1fc8fbaabd56213.tar.bz2
mate-control-center-0ac9d0c1375e3c36a7cd07ece1fc8fbaabd56213.tar.xz
glib-genmarshal: Using --header and --body at the same time is deprecated
-rw-r--r--capplets/about-me/Makefile.am2
-rw-r--r--capplets/display/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 59b68313..4c72622e 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -20,7 +20,7 @@ mate_about_me_SOURCES = \
marshal.h: fprintd-marshal.list
@GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --header > $@
marshal.c: fprintd-marshal.list
- @GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --body --header > $@
+ @GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --body --prototypes > $@
mate-about-me-resources.h mate-about-me-resources.c: org.mate.mcc.am.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.am.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name about_me $<
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index e6fec237..24dfa1b7 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -58,7 +58,7 @@ AM_CPPFLAGS = \
foo-marshal.c: foo-marshal.list
@GLIB_GENMARSHAL@ --prefix=foo_marshal $< --header > $@
foo-marshal.h: foo-marshal.list
- @GLIB_GENMARSHAL@ --prefix=foo_marshal $< --body --header > $@
+ @GLIB_GENMARSHAL@ --prefix=foo_marshal $< --body --prototypes > $@
mate-display-properties-resources.h mate-display-properties-resources.c: org.mate.mcc.display.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir) $(srcdir)/org.mate.mcc.display.gresource.xml)
$(AM_V_GEN) XMLLINT=$(XMLLINT) $(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir $(srcdir) --generate --c-name display $<