diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-10-08 20:49:14 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-10-08 20:49:14 +0800 |
| commit | e9340cbe3cecbb19bce27b500b7015e9912452e4 (patch) | |
| tree | 3a4e07684defed45738f2977534519fdc76d8f0f /src | |
| parent | ea7da1c6abfa87614a9dd484afc26cccf93cf37f (diff) | |
| download | gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.tar gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.tar.gz gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.tar.bz2 gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.tar.lz gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.tar.xz gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.tar.zst gsoc2013-epiphany-e9340cbe3cecbb19bce27b500b7015e9912452e4.zip | |
Make the enum/flags values not global.
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/bookmarks/Makefile.am | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b92ac5ec5..c8c3aff3c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -267,13 +267,13 @@ stamp-ephy-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES) --fhead "#include \"ephy-type-builtins.h\"\n\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n#include \"@filename@\"" \ - --vhead "const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (G_UNLIKELY (type == 0))\n" \ - --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ + --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[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --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) \ && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am index 218b5e0b1..935335b0b 100644 --- a/src/bookmarks/Makefile.am +++ b/src/bookmarks/Makefile.am @@ -69,13 +69,13 @@ stamp-ephy-bookmarks-type-builtins.c: $(INST_H_FILES) $(NOINST_H_FILES) --fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n#include \"@filename@\"" \ - --vhead "const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (G_UNLIKELY (type == 0))\n" \ - --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ + --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[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --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) \ && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ |