diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index b45f368946..d88d1faa6c 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -7,7 +7,7 @@ DOC_MODULE=gdk-pixbuf
DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=$(GDK_PIXBUF_DIR)/src
+DOC_SOURCE_DIR=$(GDK_PIXBUF_DIR)/gdk-pixbuf
CFLAGS=`gnome-config --cflags gnomeui gdk_pixbuf`
LDFLAGS=`gnome-config --libs gnomeui gdk_pixbuf`
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
index 8b1480d1f8..04c1f85c9f 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-decl.txt
@@ -1,23 +1,12 @@
-
-GdkPixbufCache
-typedef struct {
- int dummy;
-} GdkPixbufCache;
-
-gdk_pixbuf_cache_new
-GdkPixbufCache *
-long image_cache_limit,long pixmap_bitmap_cache_limit
+gdk_pixbuf_rgb_from_drawable
+GdkPixbuf *
+GdkWindow *window, gint x, gint y, gint width, gint height
-gdk_pixbuf_cache_destroy
-void
-GdkPixbufCache *cache
-
-
-gdk_pixbuf_cache_load_image
-GdkPixbuf *
-GdkPixbufCache *cache,const char *file
+gdk_pixbuf_rgba_from_drawable
+GdkPixbuf *
+GdkWindow *window, gint x, gint y, gint width, gint height
ModulePreparedNotifyFunc
@@ -57,6 +46,67 @@ gchar *buffer, gint size
void
GdkPixbufModule *image_module
+
+GDK_TYPE_PIXBUF_LOADER
+#define GDK_TYPE_PIXBUF_LOADER (gdk_pixbuf_loader_get_type ())
+
+
+GDK_PIXBUF_LOADER
+#define GDK_PIXBUF_LOADER(obj) (GTK_CHECK_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
+
+
+GDK_PIXBUF_LOADER_CLASS
+#define GDK_PIXBUF_LOADER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
+
+
+GDK_IS_PIXBUF_LOADER
+#define GDK_IS_PIXBUF_LOADER(obj) (GTK_CHECK_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
+
+
+GDK_IS_PIXBUF_LOADER_CLASS
+#define GDK_IS_PIXBUF_LOADER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
+
+
+GdkPixbufLoader
+
+
+GdkPixbufLoader
+struct GdkPixbufLoader
+{
+ GtkObject object;
+
+ /* < Private > */
+ gpointer private;
+};
+
+
+GdkPixbufLoaderClass
+
+
+gdk_pixbuf_loader_get_type
+GtkType
+void
+
+
+gdk_pixbuf_loader_new
+GdkPixbufLoader *
+void
+
+
+gdk_pixbuf_loader_write
+gboolean
+GdkPixbufLoader *loader, const gchar *buf, size_t count
+
+
+gdk_pixbuf_loader_get_pixbuf
+GdkPixbuf *
+GdkPixbufLoader *loader
+
+
+gdk_pixbuf_loader_close
+void
+GdkPixbufLoader *loader
+
GdkPixbuf
@@ -172,26 +222,6 @@ GdkPixbuf *pixbuf,GdkDrawable *drawable, GdkGC *gc,int src_x, int src_y,int dest
void
GdkPixbuf *pixbuf, GdkDrawable *drawable,int src_x, int src_y,int dest_x, int dest_y,int width, int height,GdkPixbufAlphaMode alpha_mode,int alpha_threshold,GdkRgbDither dither,int x_dither, int y_dither
-
-gdk_pixbuf_scale
-GdkPixbuf *
-const GdkPixbuf *pixbuf, gint w, gint h
-
-
-gdk_pixbuf_rotate
-GdkPixbuf *
-GdkPixbuf *pixbuf, gdouble angle
-
-
-gdk_pixbuf_rgb_from_drawable
-GdkPixbuf *
-GdkWindow *window, gint x, gint y, gint width, gint height
-
-
-gdk_pixbuf_rgba_from_drawable
-GdkPixbuf *
-GdkWindow *window, gint x, gint y, gint width, gint height
-
GNOME_TYPE_CANVAS_PIXBUF
#define GNOME_TYPE_CANVAS_PIXBUF (gnome_canvas_pixbuf_get_type ())
@@ -235,64 +265,3 @@ struct GnomeCanvasPixbuf {
GtkType
void
-
-GDK_TYPE_PIXBUF_LOADER
-#define GDK_TYPE_PIXBUF_LOADER (gdk_pixbuf_loader_get_type ())
-
-
-GDK_PIXBUF_LOADER
-#define GDK_PIXBUF_LOADER(obj) (GTK_CHECK_CAST ((obj), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoader))
-
-
-GDK_PIXBUF_LOADER_CLASS
-#define GDK_PIXBUF_LOADER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_LOADER, GdkPixbufLoaderClass))
-
-
-GDK_IS_PIXBUF_LOADER
-#define GDK_IS_PIXBUF_LOADER(obj) (GTK_CHECK_TYPE ((obj), GDK_TYPE_PIXBUF_LOADER))
-
-
-GDK_IS_PIXBUF_LOADER_CLASS
-#define GDK_IS_PIXBUF_LOADER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_LOADER))
-
-
-GdkPixbufLoader
-
-
-GdkPixbufLoader
-struct GdkPixbufLoader
-{
- GtkObject object;
-
- /* < Private > */
- gpointer private;
-};
-
-
-GdkPixbufLoaderClass
-
-
-gdk_pixbuf_loader_get_type
-GtkType
-void
-
-
-gdk_pixbuf_loader_new
-GdkPixbufLoader *
-void
-
-
-gdk_pixbuf_loader_write
-gboolean
-GdkPixbufLoader *loader, const gchar *buf, size_t count
-
-
-gdk_pixbuf_loader_get_pixbuf
-GdkPixbuf *
-GdkPixbufLoader *loader
-
-
-gdk_pixbuf_loader_close
-void
-GdkPixbufLoader *loader
-
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 301139ce0b..7881c0bc56 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,18 @@
+1999-12-02 Federico Mena Quintero
+
+ Source files moved from src/ to gdk-pixbuf/, to be consistent with
+ other libraries.
+
+ * doc/Makefile.am: Modified for the new source directory.
+
+ * configure.in: Likewise.
+
+ * Makefile.am: Likewise.
+
+ * autogen.sh: Likewise.
+
+ * gdk-pixbuf/Makefile.am: Likewise.
+
1999-12-02 Federico Mena Quintero
* src/testpixbuf.c: #include , and fix includes.
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 7627615edc..817f0c20c5 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -43,7 +43,7 @@ noinst_PROGRAMS = testpixbuf
DEPS = libgdk_pixbuf.la
-INCLUDES = -I$(top_builddir)/src $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
+INCLUDES = -I$(top_builddir)/gdk-pixbuf $(GLIB_CFLAGS) $(LIBART_CFLAGS) $(GTK_CFLAGS)
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)