Style improvements that I forgot about in last commit.

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8ed999a6585744a6e78a981f42d82d6d7013acb0..c4cc593d9eb34a34deb46302d89289536d8ade01 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,6 +16,10 @@ INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
+       -DG_DISABLE_DEPRECATED                          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGDK_DISABLE_DEPRECATED                        \
+       -DGTK_DISABLE_DEPRECATED                        \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_DEP_CFLAGS@                                \
 @STRIP_END@
@@ -531,7 +535,7 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
        && echo timestamp > $(@F)
 $(srcdir)/gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
        ( cd $(srcdir) && glib-mkenums \
-                       --fhead "#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
+                       --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.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[] = {" \
                        --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \