--- gdk-pixbuf/Makefile.in.orig	Wed Dec 18 14:19:32 2002
+++ gdk-pixbuf/Makefile.in	Sun Jun 22 18:01:15 2003
@@ -133,70 +133,70 @@
 #
 libpixbufloader_png_la_SOURCES = io-png.c
 libpixbufloader_png_la_LDFLAGS = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-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 = -module -avoid-version
-libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
+libpixbufloader_xbm_la_LIBADD = $(GTK_LIBS)
 
 @HAVE_PNG_TRUE@PNG_LIB = @HAVE_PNG_TRUE@libpixbufloader-png.la
 
@@ -310,7 +310,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			\
@@ -356,8 +356,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 \
@@ -380,25 +379,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) \