diff -Naur gdk-pixbuf-0.18.0.old/Makefile.in gdk-pixbuf-0.18.0.tmp/Makefile.in
--- gdk-pixbuf-0.18.0.old/Makefile.in	Wed Jun 19 03:17:00 2002
+++ gdk-pixbuf-0.18.0.tmp/Makefile.in	Sat Jun 22 05:58:21 2002
@@ -111,7 +111,7 @@
 STRIP_END = @STRIP_END@
 VERSION = @VERSION@
 
-SUBDIRS = gdk-pixbuf demo doc
+SUBDIRS = gdk-pixbuf doc
 
 bin_SCRIPTS = gdk-pixbuf-config
 
diff -Naur gdk-pixbuf-0.18.0.old/configure gdk-pixbuf-0.18.0.tmp/configure
--- gdk-pixbuf-0.18.0.old/configure	Wed Jun 19 03:11:21 2002
+++ gdk-pixbuf-0.18.0.tmp/configure	Sat Jun 22 05:58:58 2002
@@ -4392,7 +4392,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $tmp_verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
diff -Naur gdk-pixbuf-0.18.0.old/gdk-pixbuf/Makefile.in gdk-pixbuf-0.18.0.tmp/gdk-pixbuf/Makefile.in
--- gdk-pixbuf-0.18.0.old/gdk-pixbuf/Makefile.in	Wed Jun 19 03:17:03 2002
+++ gdk-pixbuf-0.18.0.tmp/gdk-pixbuf/Makefile.in	Sat Jun 22 06:00:52 2002
@@ -130,70 +130,70 @@
 #
 libpixbufloader_png_la_SOURCES = io-png.c
 libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_png_la_LIBADD = $(LIBPNG) $(GTK_LIBS)
 
 #
 # The JPEG loader
 #
 libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
 libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(GTK_LIBS)
 
 #
 # The XPM loader
 #
 libpixbufloader_xpm_la_SOURCES = io-xpm.c
 libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_xpm_la_LIBADD = $(GTK_LIBS)
 
 #
 # The GIF loader
 #
 libpixbufloader_gif_la_SOURCES = io-gif.c
 libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_gif_la_LIBADD = $(GTK_LIBS)
 
 #
 # The ICO loader
 #
 libpixbufloader_ico_la_SOURCES = io-ico.c
 libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_ico_la_LIBADD = $(GTK_LIBS)
 
 #
 # The RAS loader
 #
 libpixbufloader_ras_la_SOURCES = io-ras.c
 libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_ras_la_LIBADD = $(GTK_LIBS)
 
 #
 # The TIFF loader
 #
 libpixbufloader_tiff_la_SOURCES = io-tiff.c
 libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(GTK_LIBS)
 
 #
 # The PNM loader
 #
 libpixbufloader_pnm_la_SOURCES = io-pnm.c
 libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_pnm_la_LIBADD = $(GTK_LIBS)
 
 #
 # The BMP loader
 #
 libpixbufloader_bmp_la_SOURCES = io-bmp.c
 libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_bmp_la_LIBADD = $(GTK_LIBS)
 
 #
 # The XBM loader
 #
 libpixbufloader_xbm_la_SOURCES = io-xbm.c
 libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_xbm_la_LIBADD = $(GTK_LIBS)
 
 @HAVE_PNG_TRUE@PNG_LIB = libpixbufloader-png.la
 
@@ -262,7 +262,7 @@
 
 
 libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
-libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
+libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la $(GTK_LIBS)
 
 libgdk_pixbufinclude_HEADERS =  	gdk-pixbuf.h				gdk-pixbuf-loader.h			gdk-pixbuf-features.h			gdk-pixbuf-xlib.h			gdk-pixbuf-xlibrgb.h			$(CANVAS_PIXBUF_HEADERFILES)
 
@@ -299,8 +299,7 @@
 @BUILD_DYNAMIC_MODULES_TRUE@gdk-pixbuf-loader.lo gdk-pixbuf-render.lo \
 @BUILD_DYNAMIC_MODULES_TRUE@gdk-pixbuf-scale.lo gdk-pixbuf-util.lo \
 @BUILD_DYNAMIC_MODULES_TRUE@gdk-pixbuf-parse-color.lo
-libgdk_pixbuf_xlib_la_DEPENDENCIES =  pixops/libpixops.la \
-libgdk_pixbuf.la
+libgdk_pixbuf_xlib_la_DEPENDENCIES =  pixops/libpixops.la
 @BUILD_DYNAMIC_MODULES_FALSE@libgdk_pixbuf_xlib_la_OBJECTS =  \
 @BUILD_DYNAMIC_MODULES_FALSE@gdk-pixbuf.lo gdk-pixbuf-xlib.lo \
 @BUILD_DYNAMIC_MODULES_FALSE@gdk-pixbuf-animation.lo gdk-pixbuf-data.lo \
@@ -323,25 +322,25 @@
 libgnomecanvaspixbuf_la_LIBADD = 
 @BUILD_CANVAS_ITEM_TRUE@libgnomecanvaspixbuf_la_OBJECTS =  \
 @BUILD_CANVAS_ITEM_TRUE@gnome-canvas-pixbuf.lo
-libpixbufloader_png_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_png_la_DEPENDENCIES = 
 libpixbufloader_png_la_OBJECTS =  io-png.lo
-libpixbufloader_jpeg_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_jpeg_la_DEPENDENCIES = 
 libpixbufloader_jpeg_la_OBJECTS =  io-jpeg.lo
-libpixbufloader_gif_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_gif_la_DEPENDENCIES = 
 libpixbufloader_gif_la_OBJECTS =  io-gif.lo
-libpixbufloader_ico_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_ico_la_DEPENDENCIES = 
 libpixbufloader_ico_la_OBJECTS =  io-ico.lo
-libpixbufloader_ras_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_ras_la_DEPENDENCIES = 
 libpixbufloader_ras_la_OBJECTS =  io-ras.lo
-libpixbufloader_xpm_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_xpm_la_DEPENDENCIES = 
 libpixbufloader_xpm_la_OBJECTS =  io-xpm.lo
-libpixbufloader_tiff_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_tiff_la_DEPENDENCIES = 
 libpixbufloader_tiff_la_OBJECTS =  io-tiff.lo
-libpixbufloader_pnm_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_pnm_la_DEPENDENCIES = 
 libpixbufloader_pnm_la_OBJECTS =  io-pnm.lo
-libpixbufloader_bmp_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_bmp_la_DEPENDENCIES = 
 libpixbufloader_bmp_la_OBJECTS =  io-bmp.lo
-libpixbufloader_xbm_la_DEPENDENCIES =  libgdk_pixbuf.la
+libpixbufloader_xbm_la_DEPENDENCIES = 
 libpixbufloader_xbm_la_OBJECTS =  io-xbm.lo
 noinst_PROGRAMS =  test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
 testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \
diff -Naur gdk-pixbuf-0.18.0.old/ltmain.sh gdk-pixbuf-0.18.0.tmp/ltmain.sh
--- gdk-pixbuf-0.18.0.old/ltmain.sh	Wed Jun 19 03:11:09 2002
+++ gdk-pixbuf-0.18.0.tmp/ltmain.sh	Sat Jun 22 05:58:22 2002
@@ -2924,7 +2924,23 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
+	  save_deplibs="$deplibs"
+	  for conv in $convenience; do
+	    tmp_deplibs=
+	    for test_deplib in $deplibs; do
+	      if test "$test_deplib" != "$conv"; then
+	        tmp_deplibs="$tmp_deplibs $test_deplib"
+	      fi
+	    done
+	    deplibs="$tmp_deplibs"
+	  done
 	  eval cmds=\"$archive_cmds\"
+	  deplibs="$save_deplibs"
 	fi
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do