use $(GLIB_MKENUMS) instead of glib-mkenums. (#318582, Damien Carbery)

2005-10-26  Matthias Clasen  <mclasen@redhat.com>

        * */Makefile.am: use $(GLIB_MKENUMS) instead of
        glib-mkenums.  (#318582, Damien Carbery)

diff --git a/ChangeLog b/ChangeLog
index 6f3639fb439538c7ef9819bacf82d230eb42b214..6e8ebb1135b935cff403be4971eb422227f0084c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6f3639fb439538c7ef9819bacf82d230eb42b214..6e8ebb1135b935cff403be4971eb422227f0084c 100644 (file)
--- 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 b66a468af54c2661931d88fe2b26d69ca5a197b2..8a6638d11227d6eea40b2abf65e2de59bd7398ca 100644 (file)
--- 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 6db73bd08449309ebd4d764f7e375772397df80b..56c47b199cf1a783647b5084f09e9906e5e6f318 100644 (file)
--- 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 9a56a1fb5e639606d439e2d8d92e5348f9dec4e8..2010a509229df0e6a8592e88638481d140c947bf 100644 (file)
--- 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 96ac157d037040a84fe5354b28f9a2500fe1f5a4..6a6ae118268ad75ad690cf065b9ffb3e999d5cfb 100644 (file)
--- 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@\" */" \