From f275967c8675cb908218806efdc848e91fb3d357 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 3 May 2017 11:55:00 +0100 Subject: build: Stop including the generated marshaller header Newer versions of glib-genmarshal generate the function prototypes for us, so we don't need to include the generated header by injecting an "include" pre-processor directive when generating the body. --- build/autotools/Makefile.am.marshal | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build/autotools/Makefile.am.marshal b/build/autotools/Makefile.am.marshal index 89d3222eb..f29629ce1 100644 --- a/build/autotools/Makefile.am.marshal +++ b/build/autotools/Makefile.am.marshal @@ -43,10 +43,9 @@ $(marshal_h): stamp-marshal @true $(marshal_c): $(marshal_h) - $(AM_V_GEN)(echo "#include \"$(marshal_h)\"" ; \ - $(GLIB_GENMARSHAL) \ + $(AM_V_GEN)$(GLIB_GENMARSHAL) \ --prefix=$(glib_marshal_prefix) \ --body \ - $(marshal_list)) > xgen-mc \ - && cp xgen-mc $(marshal_c) \ + $(marshal_list) > xgen-mc \ + && (cmp -s xgen-mc $(marshal_c) || cp -f xgen-mc $(marshal_c)) \ && rm -f xgen-mc -- cgit v1.2.1