From aa3b6c57a51dbd64af2371fd7a218231a3a56b19 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 27 Aug 2011 07:54:44 -0400 Subject: 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. --- e-util/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'e-util') 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 -- cgit v1.2.3