Fix up linker flags

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

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 09131c5aed365381eac78438a630c9d5a00f66bc..f87b3cd8b9274bc14a9c1b312219f321875a9b25 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,46 +1,61 @@
 ## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gtk-demo
 
-INCLUDES = @STRIP_BEGIN@ \
-       -I$(top_srcdir)                                 \
-       -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
-       -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_DEPRECATED                        \
-       @GTK_DEBUG_FLAGS@                               \
-       @GTK_DEP_CFLAGS@                                \
-@STRIP_END@
+INCLUDES =                             \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/gdk           \
+       -DGDK_DISABLE_DEPRECATED        \
+       -DGTK_DISABLE_DEPRECATED        \
+       $(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@              \
-@STRIP_END@
+LDADDS =                                                               \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(GTK_DEP_LIBS)                                                 \
+       $(MATH_LIB)
 
 noinst_PROGRAMS =              \
-       testpixbuf              \
        testpixbuf-drawable     \
        testanimation           \
+       testpixbuf-color        \
        testpixbuf-save         \
        testpixbuf-scale        \
        pixbuf-demo
 
-test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource 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/gdk-pixbuf-csource --build-list \
-               apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/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
+
+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)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
+testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
@@ -48,19 +63,20 @@ pixbuf_demo_DEPENDENCIES = $(DEPS)
 testpixbuf_LDADD = $(LDADDS)
 testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
+testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
 testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)
 
 testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-$(testpixbuf_OBJECTS): test-inline-pixbufs.h
 testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
+testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
 
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        apple-red.png           \
        background.jpg          \
        gnome-applets.png       \
@@ -70,3 +86,7 @@ EXTRA_DIST =                  \
        gnome-gmush.png         \
        gnome-gsame.png         \
        gnu-keys.png
+
+DISTCLEANFILES = test-inline-pixbufs.h
+
+-include $(top_srcdir)/git.mk