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

diff --git a/ChangeLog b/ChangeLog
index a4f3b35010f130f57a5d766d7439adee41c853cb..5c9f4139acb03425170a51dc7955ef309a10b5df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+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

diff --git a/configure.in b/configure.in
index 8ad226c984a9af67c67bf9c7a9d9b334acba832a..4bf221c228d317ea021e6feb2d22cbf98f6732be 100644 (file)
--- 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 355190e75cedd030a9bfa892456467f5cae3b7d8..328bbe67584a8ce981b339c88c98b72754c1e6d1 100644 (file)
--- 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 e50284e355d004fe93ce41b9bcef16a26618bed5..fd819543e207c67c44ac702fb27bab2fb416ecc2 100644 (file)
--- 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 964f8130bc59c56e79d4383935dc0085921d4180..a8b0fede64e464d7ad2e7876c28cd735c769e25d 100644 (file)
--- 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 9efb22605098d60e2050888bd7570622b9a22d5b..c1ac55438317315a864cfacafc9940eb4f2c17f0 100644 (file)
--- 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 af163f3dc1e94232f5f69fb91b545768e6bc23a4..e4c4e26cbfef1be3e940194ffe2abb8be8467db6 100644 (file)
--- 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 e4940cf495bd6da1cece268dad79a79074e010d4..500c95064b79f0caa49f75e98d3a9bcd2167640c 100644 (file)
--- 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 eb88a70cd0208195a7d639afd21bf9adae6ed393..0b6d5ec5d5332754bb2946aab4bcd1d3a2e381b6 100644 (file)
--- 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 8d4330132ef6ad4d6394a17e49f28a7fb7627873..d17f59c3224f4f12af5785254acf04993c7b0587 100644 (file)
--- 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 346637d25edaae5cc82d6f468d48cd0d2057fae9..f36d5e53837a45c68ea6372aa654cb663a05a57d 100644 (file)
--- 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 fad97cc36861b6e685f9c1dcae730c7e4088a025..eb24bfc76caadf2c6cfc48a30b9ebd6f3becbfd1 100644 (file)
--- 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 3c9ef26ca19d5ae9507cdbce57593bdb7156baf0..975d061c000a3dc47ffa8c39f1d4136814fabcea 100644 (file)
--- 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 3f4d45092a2edf5e2861c698382ebd77e087530e..df50cba67af10af6585753b55e72e1f121163122 100644 (file)
--- 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 d098c78e6e9ea6924acf8d136f635dacadbd3ac8..0613d049a05b8ac5c2b4dd20db132468ec437e16 100644 (file)
--- 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 f3cee2cfb0e972b57563cbb9aa49921383ee381a..9fcf418951db5010dac9c36f83368eeb7c362cfb 100644 (file)
--- 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 fa5ce141171cfcb618df4c3b5158ba3d18cf4248..bd8848347ee87b24362ccb5f30b0a2ed3f38a0e6 100644 (file)
--- 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 =                                                                 \