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 /gdk-pixbuf | |
| 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
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/pixops/Makefile.am | 3 |
2 files changed, 3 insertions, 4 deletions
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 |