diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-14 16:38:04 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-14 16:38:04 +0000 |
| commit | c879883dc650f7fbec9ccdfc5c047bce1bb08b6f (patch) | |
| tree | 883259278c6470ba384ec68ad68cd61a24cbd901 /gtk/stock-icons/Makefile.am | |
| parent | 5dd656fa8d7da168ef2c11e0238f77a8e406db17 (diff) | |
| download | gtk+-c879883dc650f7fbec9ccdfc5c047bce1bb08b6f.tar.gz | |
Fix srcdir != builddir
Mon Nov 13 14:43:48 2000 Owen Taylor <otaylor@redhat.com>
* 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.
Diffstat (limited to 'gtk/stock-icons/Makefile.am')
| -rw-r--r-- | gtk/stock-icons/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 3bf0d50741..c11abfca2d 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -20,4 +20,12 @@ VARIABLES= dialog_error dialog_error.png \ stock_save stock_save.png gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/make-inline-pixbuf $(IMAGES) - GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf/.libs $(top_builddir)/gdk-pixbuf/make-inline-pixbuf gtkstockpixbufs.h $(VARIABLES) + (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ + cd $(top_srcdir)/gtk/stock-icons && \ + GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/make-inline-pixbuf $$curdir/gtkstockpixbufs.h $(VARIABLES)) + +EXTRA_DIST = $(IMAGES) + +# For some reason, rebuilding of this file doesn't happen in the make dist'ed version, so force it. + +all-am: gtkstockpixbufs.h |