diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-06-26 01:06:30 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-06-26 01:09:05 -0400 |
| commit | 16ecf558321030a12795cdd0b67ebbdc198d5c43 (patch) | |
| tree | c3c4ff539366a54230e56861c7f0ac740ba326f5 /demos/Makefile.am | |
| parent | d722adb76abce67984f24a98433c245d86674b5c (diff) | |
| download | gtk+-16ecf558321030a12795cdd0b67ebbdc198d5c43.tar.gz | |
Make GTK+ use an external gdk-pixbuf
Diffstat (limited to 'demos/Makefile.am')
| -rw-r--r-- | demos/Makefile.am | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index e51ed908e2..75fcbe5d79 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -12,12 +12,10 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ $(top_builddir)/gtk/$(gtktargetlib) LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ $(top_builddir)/gtk/$(gtktargetlib) \ $(GTK_DEP_LIBS) \ @@ -32,21 +30,11 @@ noinst_PROGRAMS = \ 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=$(top_builddir)/gdk-pixbuf/loaders.cache $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0 -pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource-3.0 $(top_builddir)/gdk-pixbuf/loaders.cache -endif - -test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png - $(pixbuf_csource) --raw --build-list \ +test-inline-pixbufs.h: apple-red.png gnome-foot.png + $(GDK_PIXBUF_CSOURCE) --raw --build-list \ apple_red $(srcdir)/apple-red.png \ gnome_foot $(srcdir)/gnome-foot.png \ > test-inline-pixbufs.h \ |