Conditionalize deendencies for gdk-pixbuf-csource on cross-compilation

[~andy/gtk] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 8196dea14e790e3f7c439acdf374b2f823c4d6b7..e3528b2dcb65e6f44458e189ce234c9faec512fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/Makefile.am: Conditionalize deendencies for
+       gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe). 
+       Buildtest-inline-pixbufs.h in srcdir. Don't try to build 
+       test-inline-pixbufs.h if we don't have libpng.
+
+       * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): 
+       Add a dependency on gdk-pixbuf.loaders when not 
+       cross-compiling, remove the dependency on gdk-pixbuf-csource
+       when not cross compiling.
+
 Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_get_default_size): Handle