If major.minor of required and available glib versions are the same, add

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

diff --git a/demos/Makefile.am b/demos/Makefile.am
index d86c8a1cc611e632dc686b674c6a93a390f7e18e..7ab6ef0b4669ad862f353f96eb6681caba8d74f6 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -2,50 +2,52 @@
 
 SUBDIRS = gtk-demo
 
-INCLUDES = @STRIP_BEGIN@ \
+INCLUDES =                                             \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
-       -DGTK_DISABLE_COMPAT_H                          \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+       -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \
-       @GTK_DEBUG_FLAGS@                               \
-       @GTK_XIM_FLAGS@                                 \
-       @PANGO_CFLAGS@                                  \
-       @GLIB_CFLAGS@                                   \
-       @more_cflags@                                   \
-@STRIP_END@
+       $(GTK_DEBUG_FLAGS)                              \
+       $(GTK_DEP_CFLAGS)
 
-DEPS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-       $(top_builddir)/gtk/@gtktargetlib@
+DEPS =                                                                         \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(top_builddir)/gtk/$(gtktargetlib)
 
-LDADDS = @STRIP_BEGIN@                                         \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
-       $(top_builddir)/gdk/@gdktargetlib@              \
-       $(top_builddir)/gtk/@gtktargetlib@              \
-       @more_ldflags@                                  \
-       @more_libs@                                     \
-       @GDK_WLIBS@                                     \
-       @PANGO_LIBS@                                    \
-       @GLIB_LIBS@                                     \
-       @GTK_LIBS_EXTRA@                                \
-       -lm                                             \
-@STRIP_END@
+LDADDS =                                                               \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(top_builddir)/gtk/$(gtktargetlib)
 
 noinst_PROGRAMS =              \
-       testpixbuf              \
        testpixbuf-drawable     \
        testanimation           \
        testpixbuf-save         \
        testpixbuf-scale        \
        pixbuf-demo
 
-BUILT_SOURCES=test-inline-pixbufs.h
+# Need to build test-inline-pixbufs.h for testpixbuf
+if HAVE_PNG
+noinst_PROGRAMS += testpixbuf
+BUILT_SOURCES = test-inline-pixbufs.h
+endif
 
-test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/make-inline-pixbuf apple-red.png gnome-foot.png
-       (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
-         cd $(srcdir) &&                                    \
-            GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/make-inline-pixbuf $$curdir/test-inline-pixbufs.h  apple_red apple-red.png gnome_foot gnome-foot.png)
+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: $(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)
@@ -78,3 +80,5 @@ EXTRA_DIST =                  \
        gnome-gmush.png         \
        gnome-gsame.png         \
        gnu-keys.png
+
+DISTCLEANFILES = test-inline-pixbufs.h