aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-03-11 21:19:16 +0800
committerChristian Persch <chpe@src.gnome.org>2007-03-11 21:19:16 +0800
commit0e02c5634ef164296f6bf451ae2b35181a787989 (patch)
tree1e9be511300d5e6cdd7926857d82a9068cadd51d /src
parentaceda79d5059f2e3368415e3e6fc02e885cc7ccf (diff)
downloadgsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.tar
gsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.tar.gz
gsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.tar.bz2
gsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.tar.lz
gsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.tar.xz
gsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.tar.zst
gsoc2013-epiphany-0e02c5634ef164296f6bf451ae2b35181a787989.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am12
-rw-r--r--src/bookmarks/Makefile.am12
2 files changed, 12 insertions, 12 deletions
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)