Regenerate the type builtins when the Makefile changes. Should fix bug

2007-03-11  Christian Persch  <chpe@gnome.org>

	* 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

6 files changed, 41 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ccdb7cc4..dd393ea14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-11  Christian Persch  <chpe@gnome.org>
+
+	* 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.
+
 2007-03-07  Christian Kirbach  <Christian.Kirbach@googlemail.com>
 
 	* data/bme.desktop.in.in:
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 082ee6531..b0e648ecd 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -107,8 +107,8 @@ stamp_files = \
 
 ephy-embed-type-builtins.c: stamp-ephy-embed-type-builtins.c Makefile
 	@true
-stamp-ephy-embed-type-builtins.c: $(INST_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#include \"ephy-embed-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -120,15 +120,15 @@ stamp-ephy-embed-type-builtins.c: $(INST_H_FILES)
 		--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)
 
 ephy-embed-type-builtins.h: stamp-ephy-embed-type-builtins.h Makefile
 	@true
-stamp-ephy-embed-type-builtins.h: $(INST_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-embed-type-builtins.h: Makefile $(INST_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#ifndef EPHY_EMBED_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_EMBED_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
@@ -138,7 +138,7 @@ stamp-ephy-embed-type-builtins.h: $(INST_H_FILES)
 		--fprod "\n/* --- @filename@ --- */" \
 		--eprod "#define EPHY_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)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index dd39bd2e3..8fd4d88d3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -127,8 +127,8 @@ stamp-ephy-marshal.h: ephy-marshal.list
 
 ephy-lib-type-builtins.c: stamp-ephy-lib-type-builtins.c Makefile
 	@true
-stamp-ephy-lib-type-builtins.c: $(TYPES_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-lib-type-builtins.c: Makefile $(TYPES_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#include \"ephy-lib-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -140,15 +140,15 @@ stamp-ephy-lib-type-builtins.c: $(TYPES_H_FILES)
 		--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)
 
 ephy-lib-type-builtins.h: stamp-ephy-lib-type-builtins.h Makefile
 	@true
-stamp-ephy-lib-type-builtins.h: $(TYPES_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-lib-type-builtins.h: Makefile $(TYPES_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#ifndef EPHY_LIB_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_LIB_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
@@ -158,7 +158,7 @@ stamp-ephy-lib-type-builtins.h: $(TYPES_H_FILES)
 		--fprod "\n/* --- @filename@ --- */" \
 		--eprod "#define EPHY_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)
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 <glib-object.h>\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)
diff --git a/src/Makefile.am b/src/Makefile.am
index 54d338c9a..24054a417 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -263,8 +263,8 @@ stamp_files = \
 
 ephy-type-builtins.c: stamp-ephy-type-builtins.c Makefile
 	@true
-stamp-ephy-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#include \"ephy-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -276,15 +276,15 @@ stamp-ephy-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
 		--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)
 
 ephy-type-builtins.h: stamp-ephy-type-builtins.h Makefile
 	@true
-stamp-ephy-type-builtins.h: $(INST_H_FILES) $(NOINST_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#ifndef EPHY_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
@@ -294,7 +294,7 @@ stamp-ephy-type-builtins.h: $(INST_H_FILES) $(NOINST_H_FILES)
 		--fprod "\n/* --- @filename@ --- */" \
 		--eprod "#define EPHY_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)
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index ee29fd0f6..1863fc55b 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -64,8 +64,8 @@ stamp_files = \
 
 ephy-bookmarks-type-builtins.c: stamp-ephy-bookmarks-type-builtins.c Makefile
 	@true
-stamp-ephy-bookmarks-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -77,15 +77,15 @@ stamp-ephy-bookmarks-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
 		--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)
 
 ephy-bookmarks-type-builtins.h: stamp-ephy-bookmarks-type-builtins.h Makefile
 	@true
-stamp-ephy-bookmarks-type-builtins.h: $(INST_H_FILES) $(NOINST_H_FILES)
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+stamp-ephy-bookmarks-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+	$(GLIB_MKENUMS) \
 		--fhead "#ifndef EPHY_BOOKMARKS_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_BOOKMARKS_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
@@ -95,7 +95,7 @@ stamp-ephy-bookmarks-type-builtins.h: $(INST_H_FILES) $(NOINST_H_FILES)
 		--fprod "\n/* --- @filename@ --- */" \
 		--eprod "#define EPHY_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)