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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index e2785a3785..2a4d1166ef 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ -I$(top_builddir)/gdk \ -DGTK_DISABLE_COMPAT_H \ -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ @@ -31,7 +32,7 @@ LDADDS = @STRIP_BEGIN@ \ -lm \ @STRIP_END@ -moduledir = $(libdir)/gtk+/gtk-2.0/$(GTK_VERSION)/immodules +moduledir = $(libdir)/gtk-2.0/$(GTK_VERSION)/immodules module_LTLIBRARIES = im-cyrillic-translit.la im-xim.la im-viqr.la im-thai-broken.la im_cyrillic_translit_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module @@ -44,5 +45,9 @@ im_viqr_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module im_viqr_la_SOURCES = imviqr.c im_xim_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module -im_xim_la_SOURCES = gtkimcontextxim.c imxim.c +im_xim_la_SOURCES = \ + gtkimcontextxim.c \ + gtkimcontextxim.h \ + imxim.c + |