From 78ba8f5efadd9e84299cfcc3495fdcf9be7099f0 Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Fri, 11 May 2007 05:52:13 +0000 Subject: [PATCH] Use $(GLIB_MKENUMS) instead of calling glib-mkenums directly. This works 2007-05-11 Brian Cameron * 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 --- ChangeLog | 6 ++++++ atk/Makefile.am | 4 ++-- 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 + + * 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 * 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 \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 " \ --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[] = {" \ -- 2.7.4