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

[~andy/gtk] / demos / Makefile.am

diff --git a/demos/Makefile.am b/demos/Makefile.am
index ee30ebdca9b5e0daa17beef037353ef9c3625b74..9e401695590005c4464da447f09fed51ab02b1a5 100644 (file)
--- 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)