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 /demos | |
| parent | d4ed293db4ef9077c7d02fc924ee13a7308d286d (diff) | |
| download | gdk-pixbuf-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 'demos')
| -rw-r--r-- | demos/Makefile.am | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index ee30ebdca..9e4016955 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 +# Need to build test-inline-pixbufs.h for testpixbuf +if HAVE_PNG +noinst_PROGRAMS += testpixbuf +BUILT_SOURCES = test-inline-pixbufs.h +endif + if CROSS_COMPILING pixbuf_csource=$(GDK_PIXBUF_CSOURCE) +pixbuf_csource_deps= else -pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$$topdir/gdk-pixbuf/gdk-pixbuf.loaders $$topdir/gdk-pixbuf/gdk-pixbuf-csource +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 -BUILT_SOURCES = test-inline-pixbufs.h - -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) |