From 14237d13e2bdaf8a52534a03e390aa6ed30938fc Mon Sep 17 00:00:00 2001
From: Jonathan Blandford <jrb@redhat.com>
Date: Mon, 22 Nov 1999 20:43:58 +0000
Subject: [PATCH] make the symlink. Does not work for srcdir != buildir != .
 Beats me why; I

1999-11-22  Jonathan Blandford  <jrb@redhat.com>

	* configure.in (GDK_PIXBUF_DIR): make the symlink.  Does not work
	for srcdir != buildir != .  Beats me why; I can't figure it out.
	AC_OUTPUT_COMMANDS doesn't seem to let me substitute it correctly.
---
 demos/testpixbuf-drawable.c      | 4 ++--
 demos/testpixbuf.c               | 6 +++---
 gdk-pixbuf/ChangeLog             | 6 ++++++
 gdk-pixbuf/gdk-pixbuf-data.c     | 2 +-
 gdk-pixbuf/gdk-pixbuf-drawable.h | 2 +-
 gdk-pixbuf/gdk-pixbuf-io.c       | 3 ++-
 gdk-pixbuf/gdk-pixbuf-io.h       | 2 +-
 gdk-pixbuf/gdk-pixbuf-loader.c   | 4 ++--
 gdk-pixbuf/gdk-pixbuf-loader.h   | 2 +-
 gdk-pixbuf/gdk-pixbuf.c          | 2 +-
 gdk-pixbuf/gnome-canvas-pixbuf.c | 4 ++--
 gdk-pixbuf/io-bmp.c              | 4 ++--
 gdk-pixbuf/io-gif.c              | 4 ++--
 gdk-pixbuf/io-jpeg.c             | 4 ++--
 gdk-pixbuf/io-png.c              | 4 ++--
 gdk-pixbuf/io-pnm.c              | 4 ++--
 gdk-pixbuf/io-ras.c              | 4 ++--
 gdk-pixbuf/io-tiff.c             | 4 ++--
 gdk-pixbuf/io-xpm.c              | 2 +-
 gdk/gdkpixbuf-drawable.c         | 4 ++--
 gdk/gdkpixbuf-render.c           | 2 +-
 gtk/gdk-pixbuf-loader.c          | 4 ++--
 gtk/gdk-pixbuf-loader.h          | 2 +-
 23 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index 0521ad91ec..fa87674f04 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-drawable.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
 
 void close_app(GtkWidget *widget, gpointer data)
 {
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index 63483f8291..5d36b7a0b8 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -23,9 +23,9 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
-#include "gdk-pixbuf-loader.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf-loader.h"
 
 typedef struct {
 	FILE             *imagefile;
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 2bbf215361..9b3e516756 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-22  Jonathan Blandford  <jrb@redhat.com>
+
+	* configure.in (GDK_PIXBUF_DIR): make the symlink.  Does not work
+	for srcdir != buildir != .  Beats me why; I can't figure it out.
+	AC_OUTPUT_COMMANDS doesn't seem to let me substitute it correctly.
+
 1999-11-21  Jonathan Blandford  <jrb@redhat.com>
 
 	* src/gdk-pixbuf-io.c: added io-bmp from Arjan
diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 4c3bd36106..26c1cff9f6 100644
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf-drawable.h b/gdk-pixbuf/gdk-pixbuf-drawable.h
index 447c027bbc..f312b03c6a 100644
--- a/gdk-pixbuf/gdk-pixbuf-drawable.h
+++ b/gdk-pixbuf/gdk-pixbuf-drawable.h
@@ -2,7 +2,7 @@
 #define _GDK_PIXBUF_DRAWABLE_H_
 
 #include <gdk/gdk.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 GdkPixbuf *gdk_pixbuf_rgb_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
 GdkPixbuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index f884f484fb..c09d51a685 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -23,7 +23,8 @@
 
 #include <config.h>
 #include <string.h>
-#include "gdk-pixbuf-io.h"
+#include <glib.h>
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index ba42c95ceb..6cd889e764 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -28,8 +28,8 @@
 #define GDK_PIXBUF_IO_H
 
 #include <gmodule.h>
-#include "gdk-pixbuf.h"
 #include <stdio.h>
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index 346074f367..fc38ce2b28 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -25,8 +25,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gdk-pixbuf-loader.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf-loader.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <gtk/gtksignal.h>
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h
index 58fab340f2..1e67a17fd5 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <gtk/gtkobject.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 6c9b2730eb..83bd0d30e4 100644
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -29,7 +29,7 @@
 #include <libart_lgpl/art_pixbuf.h>
 #include <libart_lgpl/art_rgb_pixbuf_affine.h>
 #include <libart_lgpl/art_alphagamma.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 
 
diff --git a/gdk-pixbuf/gnome-canvas-pixbuf.c b/gdk-pixbuf/gnome-canvas-pixbuf.c
index 1504e96c4e..b928e430c7 100644
--- a/gdk-pixbuf/gnome-canvas-pixbuf.c
+++ b/gdk-pixbuf/gnome-canvas-pixbuf.c
@@ -24,8 +24,8 @@
 #include <math.h>
 #include <libgnomeui/gnome-canvas.h>
 #include <libgnomeui/gnome-canvas-util.h>
-#include "gdk-pixbuf.h"
-#include "gnome-canvas-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gnome-canvas-pixbuf.h"
 #include "libart_lgpl/art_rgb_pixbuf_affine.h"
 
 
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 780a43324a..d40ce7820b 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -38,8 +38,8 @@ Known bugs:
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 005bb907f0..ed194b8813 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -62,8 +62,8 @@
 #include <stdio.h>
 #include <glib.h>
 #include <string.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 68660d4c74..8ec726f0c1 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -47,8 +47,8 @@
 #include <string.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 643b16c408..d650df3181 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include <stdio.h>
 #include <png.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index a987106ed5..10681aaebd 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
index 7f44b2820c..47726b81bd 100644
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -37,8 +37,8 @@ Known bugs:
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 0a86c87f5f..c61494be23 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <tiffio.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <unistd.h>
 
 
diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index b2f0715c62..97229e60aa 100644
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gdk/gdk.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 
 
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index b2af116aef..f635af5d26 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -14,8 +14,8 @@
 #include <string.h>
 #include <glib.h>
 #include <gmodule.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-drawable.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
 
 
 #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index f708a107bb..0cc62a4bc2 100644
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <gdk/gdk.h>
 #include <libart_lgpl/art_rect.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 
 
diff --git a/gtk/gdk-pixbuf-loader.c b/gtk/gdk-pixbuf-loader.c
index 346074f367..fc38ce2b28 100644
--- a/gtk/gdk-pixbuf-loader.c
+++ b/gtk/gdk-pixbuf-loader.c
@@ -25,8 +25,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gdk-pixbuf-loader.h"
-#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf/gdk-pixbuf-loader.h"
+#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <gtk/gtksignal.h>
 
 
diff --git a/gtk/gdk-pixbuf-loader.h b/gtk/gdk-pixbuf-loader.h
index 58fab340f2..1e67a17fd5 100644
--- a/gtk/gdk-pixbuf-loader.h
+++ b/gtk/gdk-pixbuf-loader.h
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <gtk/gtkobject.h>
-#include "gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {