more changes

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index c6bc0e7b9b70b968d3c89d40f441160b7d1dc6ab..c7fe0a02e2924f93d26b8154c1ae1873a9ebb805 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -42,11 +42,13 @@ DEPS = libgdk_pixbuf.la
 INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
-LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS)
+LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
-testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
+testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) \
+       -lgmodule
+
+testpixbuf_drawable_LDADD = $(LDADDS)
 
-testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
 
 #
 # The GdkPixBuf library
@@ -59,16 +61,16 @@ libgdk_pixbuf_la_SOURCES =  \
        gdk-pixbuf-io.c         \
        gdk-pixbuf-loader.c     \
        gdk-pixbuf-render.c     \
-       gdk-pixbuf-drawable.c   \
-       gnome-canvas-pixbuf.c
+       gdk-pixbuf-drawable.c
+##     gnome-canvas-pixbuf.c
 
 libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
 
 libgdk_pixbufinclude_HEADERS = \
        gdk-pixbuf.h            \
        gdk-pixbuf-drawable.h   \
-       gdk-pixbuf-loader.h     \
-       gnome-canvas-pixbuf.h
+       gdk-pixbuf-loader.h
+##     gnome-canvas-pixbuf.h
 
 noinst_HEADERS = \
        gdk-pixbuf-io.h