diff options
author | Michael Natterer <mitch@imendio.com> | 2008-08-12 15:04:55 +0000 |
---|---|---|
committer | Michael Natterer <mitch@src.gnome.org> | 2008-08-12 15:04:55 +0000 |
commit | e0d30ee141c3a269ee4f74769e48c722633c324c (patch) | |
tree | 880a33550fb8fd8e5dded9e6552a7d4299dad5a6 | |
parent | f385a771e11ddb1b9b19b3a691259c7a7c54be28 (diff) | |
download | gtk+-e0d30ee141c3a269ee4f74769e48c722633c324c.tar.gz |
define -DGDK_PIXBUF_DISABLE_DEPRECATED in the global CFLAGS.
2008-08-12 Michael Natterer <mitch@imendio.com>
* configure.in: define -DGDK_PIXBUF_DISABLE_DEPRECATED in the
global CFLAGS.
* gdk-pixbuf/Makefile.am: make the contents gdk-pixbuf-marshal.h
visible for GDK_PIXBUF_COMPILATION.
* contrib/gdk-pixbuf-xlib/Makefile.am
* demos/Makefile.am
* demos/gtk-demo/Makefile.am
* gdk-pixbuf/pixops/Makefile.am
* gdk/Makefile.am
* gdk/x11/Makefile.am
* gtk/Makefile.am
* gtk/tests/Makefile.am
* gtk/theme-bits/Makefile.am
* modules/engines/ms-windows/Makefile.am
* modules/engines/pixbuf/Makefile.am
* modules/input/Makefile.am
* perf/Makefile.am
* tests/Makefile.am: remove -DDGDK_PIXBUF_DISABLE_DEPRECATED here.
svn path=/trunk/; revision=21096
-rw-r--r-- | ChangeLog | 23 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | contrib/gdk-pixbuf-xlib/Makefile.am | 1 | ||||
-rw-r--r-- | demos/Makefile.am | 13 | ||||
-rw-r--r-- | demos/gtk-demo/Makefile.am | 13 | ||||
-rw-r--r-- | gdk-pixbuf/Makefile.am | 4 | ||||
-rw-r--r-- | gdk-pixbuf/pixops/Makefile.am | 3 | ||||
-rw-r--r-- | gdk/Makefile.am | 1 | ||||
-rw-r--r-- | gdk/x11/Makefile.am | 15 | ||||
-rw-r--r-- | gtk/Makefile.am | 1 | ||||
-rw-r--r-- | gtk/tests/Makefile.am | 1 | ||||
-rw-r--r-- | gtk/theme-bits/Makefile.am | 5 | ||||
-rw-r--r-- | modules/engines/ms-windows/Makefile.am | 9 | ||||
-rw-r--r-- | modules/engines/pixbuf/Makefile.am | 9 | ||||
-rw-r--r-- | modules/input/Makefile.am | 17 | ||||
-rw-r--r-- | perf/Makefile.am | 15 | ||||
-rw-r--r-- | tests/Makefile.am | 15 |
17 files changed, 80 insertions, 67 deletions
@@ -1,5 +1,28 @@ 2008-08-12 Michael Natterer <mitch@imendio.com> + * configure.in: define -DGDK_PIXBUF_DISABLE_DEPRECATED in the + global CFLAGS. + + * gdk-pixbuf/Makefile.am: make the contents gdk-pixbuf-marshal.h + visible for GDK_PIXBUF_COMPILATION. + + * contrib/gdk-pixbuf-xlib/Makefile.am + * demos/Makefile.am + * demos/gtk-demo/Makefile.am + * gdk-pixbuf/pixops/Makefile.am + * gdk/Makefile.am + * gdk/x11/Makefile.am + * gtk/Makefile.am + * gtk/tests/Makefile.am + * gtk/theme-bits/Makefile.am + * modules/engines/ms-windows/Makefile.am + * modules/engines/pixbuf/Makefile.am + * modules/input/Makefile.am + * perf/Makefile.am + * tests/Makefile.am: remove -DDGDK_PIXBUF_DISABLE_DEPRECATED here. + +2008-08-12 Michael Natterer <mitch@imendio.com> + * gtk/gtkstatusicon.c (gtk_status_icon_get_gicon): use g_return_val_if_fail() now that the function has a return value. diff --git a/configure.in b/configure.in index 8ad226c984..4bf221c228 100644 --- a/configure.in +++ b/configure.in @@ -583,6 +583,8 @@ if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; th CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" fi +CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" + dnl dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am index 355190e75c..328bbe6758 100644 --- a/contrib/gdk-pixbuf-xlib/Makefile.am +++ b/contrib/gdk-pixbuf-xlib/Makefile.am @@ -10,7 +10,6 @@ INCLUDES = \ -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/gdk-pixbuf \ -I$(top_srcdir)/contrib \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ $(GDK_PIXBUF_XLIB_DEP_CFLAGS) libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ diff --git a/demos/Makefile.am b/demos/Makefile.am index e50284e355..fd819543e2 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -3,13 +3,12 @@ include $(top_srcdir)/Makefile.decl SUBDIRS = gtk-demo -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) DEPS = \ diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 964f8130bc..a8b0fede64 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -38,13 +38,12 @@ demos = \ ui_manager.c INCLUDES = \ - -DDEMOCODEDIR="\"$(democodedir)\"" \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ + -DDEMOCODEDIR="\"$(democodedir)\"" \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) DEPS = \ diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 9efb226050..c1ac554383 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -628,9 +628,9 @@ gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h @true stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list - echo "#ifndef GDK_PIXBUF_DISABLE_DEPRECATED" > xgen-gmh \ + echo "#if !defined(GDK_PIXBUF_DISABLE_DEPRECATED) || defined(GDK_PIXBUF_COMPILATION)" > xgen-gmh \ && $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \ - && echo "#endif /* GDK_PIXBUF_DISABLE_DEPRECATED */" >> xgen-gmh \ + && echo "#endif /* !GDK_PIXBUF_DISABLE_DEPRECATED || GDK_PIXBUF_COMPILATION */" >> xgen-gmh \ && (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \ && rm -f xgen-gmh xgen-gmh~ \ && echo timestamp > $(@F) diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am index af163f3dc1..e4c4e26cbf 100644 --- a/gdk-pixbuf/pixops/Makefile.am +++ b/gdk-pixbuf/pixops/Makefile.am @@ -5,8 +5,7 @@ noinst_LTLIBRARIES = libpixops.la INCLUDES = \ -I$(top_srcdir) -I$(top_builddir) \ $(GTK_DEBUG_FLAGS) \ - $(GDK_PIXBUF_DEP_CFLAGS) \ - -DGDK_PIXBUF_DISABLE_DEPRECATED + $(GDK_PIXBUF_DEP_CFLAGS) noinst_PROGRAMS = timescale diff --git a/gdk/Makefile.am b/gdk/Makefile.am index e4940cf495..500c95064b 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -28,7 +28,6 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -I$(top_srcdir)/gdk-pixbuf \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index eb88a70cd0..0b6d5ec5d5 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -3,14 +3,13 @@ include $(top_srcdir)/Makefile.decl libgdkincludedir = $(includedir)/gtk-2.0/gdk -INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ +INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -DGDK_COMPILATION \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) LDADDS = $(GDK_DEP_LIBS) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 8d4330132e..d17f59c322 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -33,7 +33,6 @@ INCLUDES = \ -I$(top_srcdir) -I../gdk \ -I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index 346637d25e..f36d5e5383 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -I$(top_srcdir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ $(GTK_DEBUG_FLAGS) \ diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am index fad97cc368..eb24bfc76c 100644 --- a/gtk/theme-bits/Makefile.am +++ b/gtk/theme-bits/Makefile.am @@ -1,7 +1,8 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ $(GDK_PIXBUF_DEP_CFLAGS) noinst_PROGRAMS = decompose-bits diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am index 3c9ef26ca1..975d061c00 100644 --- a/modules/engines/ms-windows/Makefile.am +++ b/modules/engines/ms-windows/Makefile.am @@ -5,11 +5,10 @@ SUBDIRS=Theme EXTRA_DIST += Makefile.msc INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am index 3f4d45092a..df50cba67a 100644 --- a/modules/engines/pixbuf/Makefile.am +++ b/modules/engines/pixbuf/Makefile.am @@ -5,11 +5,10 @@ no_undefined = -no-undefined endif INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) LDADDS = \ diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index d098c78e6e..0613d049a0 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -6,15 +6,14 @@ no_undefined = -no-undefined endif INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_XIM_FLAGS) \ - $(GTK_DEP_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_XIM_FLAGS) \ + $(GTK_DEP_CFLAGS) \ $(INCLUDED_IMMODULE_DEFINE) DEPS = \ diff --git a/perf/Makefile.am b/perf/Makefile.am index f3cee2cfb0..9fcf418951 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,14 +1,13 @@ ## Makefile.am for gtk+/perf include $(top_srcdir)/Makefile.decl -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + -I$(top_srcdir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) DEPS = \ diff --git a/tests/Makefile.am b/tests/Makefile.am index fa5ce14117..bd8848347e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,14 +1,13 @@ ## Makefile.am for gtk+/tests include $(top_srcdir)/Makefile.decl -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ - -I$(top_srcdir)/gdk \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - $(GTK_DEBUG_FLAGS) \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + -I$(top_srcdir)/gdk \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) DEPS = \ |