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 /gtk/stock-icons | |
| 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 'gtk/stock-icons')
| -rw-r--r-- | gtk/stock-icons/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 8ed1b3ba14..abc3c32133 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -254,17 +254,17 @@ CLEANFILES = $(noinst_DATA) pixbuf_dir = $(top_builddir)/gdk-pixbuf gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES) - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ + GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ + GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ + GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ + GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ + GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h - GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ + GDK_PIXBUF_MODULEDIR=$(pixbuf_dir) \ $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h |