diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-03 11:55:00 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-03 11:57:26 +0100 |
| commit | f275967c8675cb908218806efdc848e91fb3d357 (patch) | |
| tree | 59c90d94fe4cc78a431f78c68ad5c32e0eb14496 /build | |
| parent | f318e93e228d8aabfb057492c9793f44a6a457b2 (diff) | |
| download | clutter-f275967c8675cb908218806efdc848e91fb3d357.tar.gz | |
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.
Diffstat (limited to 'build')
| -rw-r--r-- | build/autotools/Makefile.am.marshal | 7 |
1 files 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 |