From 0e02c5634ef164296f6bf451ae2b35181a787989 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 11 Mar 2007 13:19:16 +0000 Subject: Regenerate the type builtins when the Makefile changes. Should fix bug 2007-03-11 Christian Persch * embed/Makefile.am: * lib/Makefile.am: * lib/egg/Makefile.am: * src/Makefile.am: * src/bookmarks/Makefile.am: Regenerate the type builtins when the Makefile changes. Should fix bug #416994; no code freeze break since it's only fixing a build problem. svn path=/trunk/; revision=6948 --- lib/egg/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/egg') diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am index fca14c770..4d7798bb8 100644 --- a/lib/egg/Makefile.am +++ b/lib/egg/Makefile.am @@ -59,8 +59,8 @@ stamp-eggmarshalers.c: eggmarshalers.list eggtypebuiltins.c: stamp-eggtypebuiltins.c Makefile @true -stamp-eggtypebuiltins.c: $(EGGHEADERS) - ( cd $(srcdir) && $(GLIB_MKENUMS) \ +stamp-eggtypebuiltins.c: Makefile $(EGGHEADERS) + $(GLIB_MKENUMS) \ --fhead "#include \"eggtypebuiltins.h\"\n\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n#include \"@filename@\"" \ @@ -72,15 +72,15 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS) --vtail " { 0, NULL, NULL }\n };\n\n" \ --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \ --vtail " return type;\n}\n\n" \ - $(^F) ) > xgen-$(@F) \ + $(filter-out $<,$^) > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) eggtypebuiltins.h: stamp-eggtypebuiltins.h Makefile @true -stamp-eggtypebuiltins.h: $(EGGHEADERS) - ( cd $(srcdir) && $(GLIB_MKENUMS) \ +stamp-eggtypebuiltins.h: Makefile $(EGGHEADERS) + $(GLIB_MKENUMS) \ --fhead "#ifndef __EGGTYPEBUILTINS_H__\n" \ --fhead "#define __EGGTYPEBUILTINS_H__ 1\n\n" \ --fhead "#include \n\n" \ @@ -90,7 +90,7 @@ stamp-eggtypebuiltins.h: $(EGGHEADERS) --fprod "\n/* --- @filename@ --- */" \ --eprod "#define EGG_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ - $(^F) ) > xgen-$(@F) \ + $(filter-out $<,$^) > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) -- cgit v1.2.3