diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-06-06 00:52:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-06-06 00:52:20 +0000 |
| commit | ff5da262864bd4bef44576bf3395d9937c98881d (patch) | |
| tree | 10aaa41e6391dc06381e595e931b7acb7be36501 /gtk/stock-icons | |
| parent | d4ed293db4ef9077c7d02fc924ee13a7308d286d (diff) | |
| download | gtk+-ff5da262864bd4bef44576bf3395d9937c98881d.tar.gz | |
Conditionalize deendencies for gdk-pixbuf-csource on cross-compilation
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.
Diffstat (limited to 'gtk/stock-icons')
| -rw-r--r-- | gtk/stock-icons/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
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 ) |