diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-05-02 14:23:12 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-05-02 14:23:12 +0000 |
| commit | e72486693f2eb1477572b32242bee673e8719077 (patch) | |
| tree | 46eee00890c62cbf883a4112273d1aaf295fca8f /gdk-pixbuf | |
| parent | c56943d3cdd1ef2002836d7a0699fec0732c021e (diff) | |
| download | gtk+-e72486693f2eb1477572b32242bee673e8719077.tar.gz | |
deprecate the entire gdk-pixbuf-marshal.h since it's installed by accident
2008-05-02 Michael Natterer <mitch@imendio.com>
* Makefile.am (stamp-gdk-pixbuf-marshal.h): deprecate the entire
gdk-pixbuf-marshal.h since it's installed by accident only and
shouldn't be used by anybody.
svn path=/trunk/; revision=20067
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 250df528cc..ddbda97e01 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2008-05-02 Michael Natterer <mitch@imendio.com> + + * Makefile.am (stamp-gdk-pixbuf-marshal.h): deprecate the entire + gdk-pixbuf-marshal.h since it's installed by accident only and + shouldn't be used by anybody. + 2008-03-21 Tor Lillqvist <tml@novell.com> Import the GDI+ gdk-pixbuf loaders for Windows by Dominic diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index d90aa43ca7..7421617f9c 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -624,7 +624,9 @@ gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h @true stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list - $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \ + echo "#ifndef GDK_PIXBUF_DISABLE_DEPRECATED" > xgen-gmh \ + && $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \ + && echo "#endif /* GDK_PIXBUF_DISABLE_DEPRECATED */" >> 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) |