diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 4 | ||||
| -rw-r--r-- | gdk/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 4 | ||||
| -rw-r--r-- | perf/Makefile.am | 4 |
6 files changed, 14 insertions, 8 deletions
@@ -1,5 +1,8 @@ 2005-10-26 Matthias Clasen <mclasen@redhat.com> + * */Makefile.am: use $(GLIB_MKENUMS) instead of + glib-mkenums. (#318582, Damien Carbery) + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify docs. (#317682, Christian - Manny Calavera - Neumair) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6f3639fb43..6e8ebb1135 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-10-26 Matthias Clasen <mclasen@redhat.com> + * */Makefile.am: use $(GLIB_MKENUMS) instead of + glib-mkenums. (#318582, Damien Carbery) + * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify docs. (#317682, Christian - Manny Calavera - Neumair) diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index b66a468af5..8a6638d112 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -370,7 +370,7 @@ gdk-pixbuf-enum-types.h: s-enum-types-h @true s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_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) G_GNUC_CONST;\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -387,7 +387,7 @@ MAINTAINERCLEANFILES += s-enum-types-h # gdk-pixbuf-enum-types.c # gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile - (cd $(srcdir) && glib-mkenums \ + (cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#include <gdk-pixbuf/gdk-pixbuf.h>\n#include \"gdk-pixbuf-alias.h\"\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --ftail "\n#define __GDK_PIXBUF_ENUM_TYPES_C__\n#include \"gdk-pixbuf-aliasdef.c\"" \ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 6db73bd084..56c47b199c 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -234,7 +234,7 @@ BUILT_SOURCES = \ gdkenumtypes.h: stamp-gdkenumtypes.h @true stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __GDK_ENUM_TYPES_H__\n#define __GDK_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) G_GNUC_CONST;\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -244,7 +244,7 @@ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) Makefile && rm -f xgen-geth \ && echo timestamp > $(@F) gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#define GDK_ENABLE_BROKEN\n#include \"gdk.h\"\n#include \"gdkalias.h\"\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --ftail "\n#define __GDK_ENUM_TYPES_C__\n#include \"gdkaliasdef.c\"\n" \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 9a56a1fb5e..2010a50922 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -644,7 +644,7 @@ gtkmarshal.c: @REBUILD@ gtkmarshal.list gtktypebuiltins.h: stamp-gtktypebuiltins.h @true stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -654,7 +654,7 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile && rm -f xgen-gtbh \ && echo timestamp > $(@F) gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \ --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ diff --git a/perf/Makefile.am b/perf/Makefile.am index 96ac157d03..6a6ae11826 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -72,7 +72,7 @@ marshalers.c: @REBUILD@ marshalers.list typebuiltins.h: stamp-typebuiltins.h @true stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#ifndef __TYPE_BUILTINS_H__\n#define __TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -82,7 +82,7 @@ stamp-typebuiltins.h: @REBUILD@ $(headers_with_enums) Makefile && rm -f xgen-gtbh \ && echo timestamp > $(@F) typebuiltins.c: @REBUILD@ $(headers_with_enums) Makefile - ( cd $(srcdir) && glib-mkenums \ + ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#include \"gtkwidgetprofiler.h\"" \ --ftail "#define __TYPE_BUILTINS_C__\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ |