From c879883dc650f7fbec9ccdfc5c047bce1bb08b6f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 14 Nov 2000 16:38:04 +0000 Subject: Fix srcdir != builddir Mon Nov 13 14:43:48 2000 Owen Taylor * demos/Makefile.am (test-inline-pixbufs.h): Fix srcdir != builddir * gtk/Makefile.am (INCLUDES): Add -I$(builddir)/gtk * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): Handles srcdir != builddir * modules/input/Makefile.am (INCLUDES): add $(top_srcdir)/gdk * configure.in (GTK_VERSION): Up to 1.3.2 * modules/input/Makefile.am (im_xim_la_SOURCES): Add gtkimcontextxim.h * gtk/gtkimcontext.c (gtk_im_context_get_preedit_string): Add missing doc comment. --- demos/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'demos/Makefile.am') diff --git a/demos/Makefile.am b/demos/Makefile.am index 5d0b3a6eba..f6c8b4ae93 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -43,7 +43,9 @@ noinst_PROGRAMS = \ BUILT_SOURCES=test-inline-pixbufs.h test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/make-inline-pixbuf apple-red.png gnome-foot.png - GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf/.libs $(top_builddir)/gdk-pixbuf/make-inline-pixbuf test-inline-pixbufs.h apple_red apple-red.png gnome_foot 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) testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS) -- cgit v1.2.1