summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2007-05-11 05:52:13 +0000
committerBrian Cameron <bcameron@src.gnome.org>2007-05-11 05:52:13 +0000
commit78ba8f5efadd9e84299cfcc3495fdcf9be7099f0 (patch)
tree0664e8d94abad94377fcb50817b86ce45d1a0462
parent1557686d8ff4eb2ce82cddde050877fcc6ba14b1 (diff)
downloadatk-78ba8f5efadd9e84299cfcc3495fdcf9be7099f0.tar.gz
Use $(GLIB_MKENUMS) instead of calling glib-mkenums directly. This works
2007-05-11 Brian Cameron <brian.cameron@sun.com> * Use $(GLIB_MKENUMS) instead of calling glib-mkenums directly. This works better when you build with glib via an uninstalled.pc file. svn path=/trunk/; revision=1179
-rw-r--r--ChangeLog6
-rw-r--r--atk/Makefile.am4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4682ac..a1691ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-11 Brian Cameron <brian.cameron@sun.com>
+
+ * Use $(GLIB_MKENUMS) instead of calling glib-mkenums directly.
+ This works better when you build with glib via an
+ uninstalled.pc file.
+
2007-04-25 Christophe Merlet <redfox@redfoxcenter.org>
* configure.in: added "oc" (Occitan) to ALL_LINGUAS.
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 39c53cc..f243d38 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -108,7 +108,7 @@ stamp-atkmarshal.c: @REBUILD@ atkmarshal.list
atk-enum-types.h: s-enum-types-h
@true
s-enum-types-h: @REBUILD@ $(atk_headers) Makefile
- ( cd $(srcdir) && glib-mkenums \
+ ( cd $(srcdir) && $(GLIB_MKENUMS) \
--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" \
@@ -121,7 +121,7 @@ s-enum-types-h: @REBUILD@ $(atk_headers) Makefile
atk-enum-types.c: s-enum-types-c
@true
s-enum-types-c: @REBUILD@ $(atk_headers) Makefile
- ( cd $(srcdir) && glib-mkenums \
+ ( cd $(srcdir) && $(GLIB_MKENUMS) \
--fhead "#include <atk.h>" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \