diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-08-27 19:54:44 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-27 20:07:52 +0800 |
commit | aa3b6c57a51dbd64af2371fd7a218231a3a56b19 (patch) | |
tree | 48aa0914a6f7507a93271133cb2653e6b4538bb7 /e-util | |
parent | f4eeac9d196423591309b872672657c1e4902d70 (diff) | |
download | gsoc2013-evolution-aa3b6c57a51dbd64af2371fd7a218231a3a56b19.tar.gz gsoc2013-evolution-aa3b6c57a51dbd64af2371fd7a218231a3a56b19.tar.zst gsoc2013-evolution-aa3b6c57a51dbd64af2371fd7a218231a3a56b19.zip |
Fix enum generation problems in glib-gen.mak.
Don't use pattern rules like %-enumtypes.h anymore because it matches
installed header files like camel-enumtypes.h, so you get very strange
things happening during the build like:
.../camel/camel-enumtypes.h: e-util-enums.h
glib-mkenums ... $^ > $@
when e-util-enums.h has a newer timestamp than camel-enumtypes.h.
Instead, we'll use another variable name -- glib_enum_output -- to
replace the %-enumtypes pattern rules like so:
$(glib_enum_output).h: $(glib_enum_headers)
glib-mkenums ... $^ > $@
$(glib_enum_output).c: $(glib_enum_headers)
glib-mkenums ... $^ > $@
Also use $(AM_V_GEN) to get cleaner looking output while building.
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 83452013a8..53614e3b06 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -4,6 +4,7 @@ ruledir = $(privdatadir) include $(top_srcdir)/glib-gen.mak glib_enum_headers=e-util-enums.h +glib_enum_output=e-util-enumtypes glib_enum_define=E glib_enum_prefix=e |