diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-09 16:28:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-09 16:28:27 +0000 |
| commit | dbae37fd65b6e31e9aa99f8bd6b8ae3b63ccb6c2 (patch) | |
| tree | 08da2fce321d26792538babfa2c8deea8119ac31 | |
| parent | 06917949b0fba13120dc411e2ed1e26f8e9d311a (diff) | |
| download | atk-dbae37fd65b6e31e9aa99f8bd6b8ae3b63ccb6c2.tar.gz | |
Include glib-object.h, Add G_BEGIN_DECLS/END_DECLS to atk-enum-types.h.
Wed Jan 9 11:26:56 2002 Owen Taylor <otaylor@redhat.com>
* atk/Makefile.am (s-enum-types-h): Include glib-object.h,
Add G_BEGIN_DECLS/END_DECLS to atk-enum-types.h. (#68325,
Mikael Hermansson)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | atk/Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Jan 9 11:26:56 2002 Owen Taylor <otaylor@redhat.com> + + * atk/Makefile.am (s-enum-types-h): Include glib-object.h, + Add G_BEGIN_DECLS/END_DECLS to atk-enum-types.h. (#68325, + Mikael Hermansson) + 2002-01-07 Padraig O'Briain <padraig.obriain@sun.com> * atk/atkcomponent.c (atk_component_add_focus_handler):1 diff --git a/atk/Makefile.am b/atk/Makefile.am index 349afb5..993cbe5 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -142,10 +142,10 @@ atk-enum-types.h: s-enum-types-h s-enum-types-h: @REBUILD@ $(atk_headers) Makefile ( cd $(srcdir) && glib-mkenums \ - --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n" \ + --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "#endif /* __ATK_ENUM_TYPES_H__ */" \ + --ftail "G_END_DECLS\n\n#endif /* __ATK_ENUM_TYPES_H__ */" \ $(atk_headers) ) > tmp-atk-enum-types.h \ && (cmp -s tmp-atk-enum-types.h $(srcdir)/atk-enum-types.h || cp tmp-atk-enum-types.h $(srcdir)/atk-enum-types.h ) \ && rm -f tmp-atk-enum-types.h \ |