diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-03 04:16:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-03 04:16:30 +0000 |
| commit | b47b15f6ba401c735d415e65d1fa7620e3546968 (patch) | |
| tree | b75d276379a8b722afc17984453dee763a29ae51 /modules | |
| parent | b3c0813b93a2aa0f39a6b06128e2b7ad9cca9175 (diff) | |
| download | gtk+-b47b15f6ba401c735d415e65d1fa7620e3546968.tar.gz | |
Fixes for uninstalled operation with module suffixes other than .so and in
Sat Mar 2 23:08:23 2002 Owen Taylor <otaylor@redhat.com>
Fixes for uninstalled operation with module suffixes
other than .so and in general for platforms like AIX where
the module suffix isn't predictable. (#72185, problems
reported by Miroslaw Dobrzanski-Neumann)
* modules/input/Makefile.am (gtk.immodules): Query .la
files rather than shared objects in .libs when creating the
uninstalled gtk.immodules file.
* gtk/gtkmain.c (_gtk_find_module): Look for .la files
after looking for the normal soname extension to handle
cases where the soname extension isn't predictable,
like AIX.
* gtk/gtkthemes.c (gtk_theme_engine_load): Don't
call g_module_build_path... leave that to
gtk_rc_find_module_in_path.
* demos/gtk-demo/main.c (main) demos/pixbuf-init.c (pixbuf_init):
tests/testgtk.c (test_init): tests/testtext.c (test_init)
tests/testdnd.c (test_init): Point gdk-pixbuf to .la
files rather than poking in .libs for .so files.
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): Remove
.libs from GDK_PIXBUF_MODULEDIR.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 6ea0affd64..97578c5ea3 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -2,9 +2,6 @@ if PLATFORM_WIN32 no_undefined = -no-undefined -SOSUFFIX=dll -else -SOSUFFIX=so endif INCLUDES = @STRIP_BEGIN@ \ @@ -98,6 +95,6 @@ module_LTLIBRARIES = \ im-viqr.la gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 .libs/*.$(SOSUFFIX) > gtk.immodules + $(top_builddir)/gtk/gtk-query-immodules-2.0 *.la > gtk.immodules all-local: gtk.immodules |