diff --git a/ChangeLog b/ChangeLog index 8196dea14e..e3528b2dcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Thu Jun 5 20:35:40 2003 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_get_default_size): Handle diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8196dea14e..e3528b2dcb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Thu Jun 5 20:35:40 2003 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_get_default_size): Handle diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8196dea14e..e3528b2dcb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Thu Jun 5 20:35:40 2003 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_get_default_size): Handle diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8196dea14e..e3528b2dcb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Thu Jun 5 20:35:40 2003 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_get_default_size): Handle diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8196dea14e..e3528b2dcb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Thu Jun 5 20:35:40 2003 Owen Taylor + + * 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 * gtk/gtkwindow.c (gtk_window_get_default_size): Handle diff --git a/demos/Makefile.am b/demos/Makefile.am index ee30ebdca9..9e40169559 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -23,26 +23,32 @@ LDADDS = \ $(top_builddir)/gtk/$(gtktargetlib) noinst_PROGRAMS = \ - testpixbuf \ testpixbuf-drawable \ testanimation \ testpixbuf-save \ testpixbuf-scale \ pixbuf-demo -if CROSS_COMPILING -pixbuf_csource=$(GDK_PIXBUF_CSOURCE) -else -pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource +# Need to build test-inline-pixbufs.h for testpixbuf +if HAVE_PNG +noinst_PROGRAMS += testpixbuf +BUILT_SOURCES = test-inline-pixbufs.h endif -BUILT_SOURCES = test-inline-pixbufs.h +if CROSS_COMPILING +pixbuf_csource=$(GDK_PIXBUF_CSOURCE) +pixbuf_csource_deps= +else +pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +endif -test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders apple-red.png gnome-foot.png - (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ - cd $(srcdir) && \ - $(pixbuf_csource) --build-list \ - apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h || (rm -f $$curdir/test-inline-pixbufs.h && false)) +test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png + $(pixbuf_csource) --raw --build-list \ + apple_red $(srcdir)/apple-red.png \ + gnome_foot $(srcdir)/gnome-foot.png \ + > test-inline-pixbufs.h \ + || (rm -f test-inline-pixbufs.h && false) testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS) diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 7c6e713d3d..3302a5de79 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -258,11 +258,13 @@ CLEANFILES = $(noinst_DATA) if CROSS_COMPILING pixbuf_csource=$(GDK_PIXBUF_CSOURCE) +pixbuf_csource_deps= else pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders endif -gtkstockpixbufs.h: @REBUILD_PNGS@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES) +gtkstockpixbufs.h: @REBUILD_PNGS@ $(pixbuf_csource_deps) $(IMAGES) $(pixbuf_csource) \ --raw --build-list $(VARIABLES1) > gtkstockpixbufs.h || \ ( rm -f gtkstockpixbufs.h && false )