[clutter/clutter-1.20] build: Fix out-of-tree builds



commit 0adac3f9dd746e9f33a36b250568d5d18da2a0a0
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Dec 16 00:02:16 2014 +0000

    build: Fix out-of-tree builds
    
    Add a srcdir prefix to the inspected files for glib-mkenums.
    
    (cherry picked from commit 8e87d0417b341ca43d9399937c5946fe9cb48c32)
    Signed-off-by: Emmanuele Bassi <ebassi gnome org>

 build/autotools/Makefile.am.enums |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/build/autotools/Makefile.am.enums b/build/autotools/Makefile.am.enums
index d3dc742..2fd69d5 100644
--- a/build/autotools/Makefile.am.enums
+++ b/build/autotools/Makefile.am.enums
@@ -26,16 +26,17 @@ $(if $(glib_enum_headers),,$(error Need to define glib_enum_headers))
 
 enum_tmpl_h=$(addprefix $(srcdir)/, $(glib_enum_h:.h=.h.in))
 enum_tmpl_c=$(addprefix $(srcdir)/, $(glib_enum_c:.c=.c.in))
+enum_headers=$(addprefix $(srcdir)/, $(glib_enum_headers))
 
 CLEANFILES += stamp-enum-types
 DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
 BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
-stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
+stamp-enum-types: $(enum_headers) $(enum_tmpl_h)
        $(AM_V_GEN)$(GLIB_MKENUMS) \
                --template $(enum_tmpl_h) \
-       $(glib_enum_headers) > xgen-eh \
+       $(enum_headers) > xgen-eh \
        && (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
        && rm -f xgen-eh \
        && echo timestamp > $(@F)
@@ -43,9 +44,9 @@ stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
 $(glib_enum_h): stamp-enum-types
        @true
 
-$(glib_enum_c): $(glib_enum_headers) $(glib_enum_h) $(enum_tmpl_c)
+$(glib_enum_c): $(enum_headers) $(enum_tmpl_h) $(enum_tmpl_c)
        $(AM_V_GEN)$(GLIB_MKENUMS) \
                --template $(enum_tmpl_c) \
-       $(glib_enum_headers) > xgen-ec \
+       $(enum_headers) > xgen-ec \
        && cp -f xgen-ec $(glib_enum_c) \
        && rm -f xgen-ec


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