aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-10-09 03:02:52 +0800
committerChristian Persch <chpe@src.gnome.org>2006-10-09 03:02:52 +0800
commitba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e (patch)
treefb43afb50fb6060c6d7cb88e23c0d08bf0cd615f
parente9340cbe3cecbb19bce27b500b7015e9912452e4 (diff)
downloadgsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.tar
gsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.tar.gz
gsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.tar.bz2
gsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.tar.lz
gsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.tar.xz
gsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.tar.zst
gsoc2013-epiphany-ba138ec9e01ef7c7fb3b583c4babd24cfa5cd69e.zip
Fix a bug in the last commit.
2006-10-08 Christian Persch <chpe@cvs.gnome.org> * embed/Makefile.am: * lib/Makefile.am: * lib/egg/Makefile.am: * src/Makefile.am: * src/bookmarks/Makefile.am: Fix a bug in the last commit.
-rw-r--r--ChangeLog10
-rw-r--r--embed/Makefile.am2
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/egg/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/bookmarks/Makefile.am2
6 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f20e5bbcc..cf9165569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,16 @@
* src/Makefile.am:
* src/bookmarks/Makefile.am:
+ Fix a bug in the last commit.
+
+2006-10-08 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/Makefile.am:
+ * lib/Makefile.am:
+ * lib/egg/Makefile.am:
+ * src/Makefile.am:
+ * src/bookmarks/Makefile.am:
+
Make the enum/flags values not global.
2006-10-06 Christian Persch <chpe@cvs.gnome.org>
diff --git a/embed/Makefile.am b/embed/Makefile.am
index c11dfac2e..26ef039ea 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -113,7 +113,7 @@ stamp-ephy-embed-type-builtins.c: $(INST_H_FILES)
--vhead "GType\n@enum_name@_get_type (void)\n{\n" \
--vhead " static GType type = 0;\n\n" \
--vhead " if (G_UNLIKELY (type == 0))\n {\n" \
- --vhead " const G@Type@Value _@enum_name@_values[] = {" \
+ --vhead " static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ead91012c..926411f50 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -137,7 +137,7 @@ stamp-ephy-lib-type-builtins.c: $(TYPES_H_FILES)
--vhead "GType\n@enum_name@_get_type (void)\n{\n" \
--vhead " static GType type = 0;\n\n" \
--vhead " if (G_UNLIKELY (type == 0))\n {\n" \
- --vhead " const G@Type@Value _@enum_name@_values[] = {" \
+ --vhead " static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index 5fd72a051..ae1d23c8d 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -67,7 +67,7 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS)
--vhead "GType\n@enum_name@_get_type (void)\n{\n" \
--vhead " static GType type = 0;\n\n" \
--vhead " if (G_UNLIKELY (type == 0))\n {\n" \
- --vhead " const G@Type@Value _@enum_name@_values[] = {" \
+ --vhead " static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \
diff --git a/src/Makefile.am b/src/Makefile.am
index c8c3aff3c..03bbeb39f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -270,7 +270,7 @@ stamp-ephy-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
--vhead "GType\n@enum_name@_get_type (void)\n{\n" \
--vhead " static GType type = 0;\n\n" \
--vhead " if (G_UNLIKELY (type == 0))\n {\n" \
- --vhead " const G@Type@Value _@enum_name@_values[] = {" \
+ --vhead " static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 935335b0b..43e34b291 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -72,7 +72,7 @@ stamp-ephy-bookmarks-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES)
--vhead "GType\n@enum_name@_get_type (void)\n{\n" \
--vhead " static GType type = 0;\n\n" \
--vhead " if (G_UNLIKELY (type == 0))\n {\n" \
- --vhead " const G@Type@Value _@enum_name@_values[] = {" \
+ --vhead " static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \