brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[build] fix Makefile.am.{enums,marshal} to support out of tree builds

Browse Source 
Out of tree builds were broken in commit 46b736f42e since we didn't
explicitly use $(srcdir) to find the input files for glib-mkenums and
glib-genmarshal.
This commit is contained in:
Robert Bragg 2009-10-15 19:12:34 +01:00
parent 4f2bfc003a
commit 2cc88f1140
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/autotools/Makefile.am.enums
View File

@ -25,7 +25,7 @@ EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
stamp-enum-types: $(glib_enum_headers) stamp-enum-types: $(glib_enum_headers)
$(QUIET_GEN)$(GLIB_MKENUMS) \ $(QUIET_GEN)$(GLIB_MKENUMS) \
--template $(enum_tmpl_h) \ --template $(srcdir)/$(enum_tmpl_h) \
$(glib_enum_headers) > xgen-eh \ $(glib_enum_headers) > xgen-eh \
&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \ && (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
&& rm -f xgen-eh \ && rm -f xgen-eh \
@ -36,7 +36,7 @@ $(glib_enum_h): stamp-enum-types
$(glib_enum_c): $(glib_enum_h) $(glib_enum_c): $(glib_enum_h)
$(QUIET_GEN)$(GLIB_MKENUMS) \ $(QUIET_GEN)$(GLIB_MKENUMS) \
--template $(enum_tmpl_c) \ --template $(srcdir)/$(enum_tmpl_c) \
$(glib_enum_headers) > xgen-ec \ $(glib_enum_headers) > xgen-ec \
&& cp -f xgen-ec $(glib_enum_c) \ && cp -f xgen-ec $(glib_enum_c) \
&& rm -f xgen-ec && rm -f xgen-ec

4
build/autotools/Makefile.am.marshal
View File

@ -26,7 +26,7 @@ stamp-marshal: $(glib_marshal_list)
$(QUIET_GEN)$(GLIB_GENMARSHAL) \ $(QUIET_GEN)$(GLIB_GENMARSHAL) \
--prefix=$(glib_marshal_prefix) \ --prefix=$(glib_marshal_prefix) \
--header \ --header \
$(glib_marshal_list) > xgen-mh \ $(srcdir)/$(glib_marshal_list) > xgen-mh \
&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \ && (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
&& rm -f xgen-mh \ && rm -f xgen-mh \
&& echo timestamp > $(@F) && echo timestamp > $(@F)
@ -39,6 +39,6 @@ $(marshal_c): $(marshal_h)
$(GLIB_GENMARSHAL) \ $(GLIB_GENMARSHAL) \
--prefix=$(glib_marshal_prefix) \ --prefix=$(glib_marshal_prefix) \
--body \ --body \
$(glib_marshal_list)) > xgen-mc \ $(srcdir)/$(glib_marshal_list)) > xgen-mc \
&& cp xgen-mc $(marshal_c) \ && cp xgen-mc $(marshal_c) \
&& rm -f xgen-mc && rm -f xgen-mc