[clutter] build: Stop including the generated marshaller header



commit f275967c8675cb908218806efdc848e91fb3d357
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed May 3 11:55:00 2017 +0100

    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 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/build/autotools/Makefile.am.marshal b/build/autotools/Makefile.am.marshal
index 89d3222..f29629c 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]