Work with srcdir != builddir.

* demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
<gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
* demos/testpixbuf.c: Likewise.
* demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
* demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
<gdk/x11/gdkx.h>.
* demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
"gdk-pixbuf.h".
* demos/Makefile.am (INCLUDES): Remove unneeded directories.

diff --git a/ChangeLog b/ChangeLog
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4cb6f44c6a858a9b2ab1992e4b51480379db7f08..bd1ae85702bfa0b975ccdef95f270750255778a2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2000-06-21  Raja R Harinath  <harinath@cs.umn.edu>
+
+       Work with srcdir != builddir.   
+       * demos/testanimation.c: Don't include "gdk-pixbuf.h".  Use
+       <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+       * demos/testpixbuf.c: Likewise.
+       * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+       * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h".  Use
+       <gdk/x11/gdkx.h>.
+       * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h".  Don't include
+       "gdk-pixbuf.h".
+       * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
 Wed Jun 21 19:45:02 2000  Owen Taylor  <otaylor@redhat.com>
 
        * TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000  Owen Taylor  <otaylor@redhat.com>
 
 Wed Jun 21 16:38:13 2000  Owen Taylor  <otaylor@redhat.com>
 
-        * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+       * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
        gdk-pixbuf.
 
        * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):

diff --git a/demos/Makefile.am b/demos/Makefile.am
index a0fcc3d67385cdbb8ee5631f92f02e2e495635fc..8d7ca2f756d11218b0647f370a0697ee815b85ad 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -2,9 +2,7 @@
 
 INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir)                                 \
-       -I$(top_builddir)/gdk-pixbuf                    \
        -I$(top_builddir)/gdk                           \
-       -I$(top_builddir)/gtk                           \
        -DGTK_DISABLE_COMPAT_H                          \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \

diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c
index 77e7c94058dc53d923ede370f96498d1402ce2f5..a256c494163b5bb3f320334e7480c68f8e57eb4d 100644 (file)
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -22,8 +22,7 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include "gtk.h"
-#include "gdk-pixbuf.h"
+#include <gtk/gtk.h>
 #include <math.h>
 
 \f

diff --git a/demos/testanimation.c b/demos/testanimation.c
index d3aeb7f286c64d3305910d435b6539960212307a..dd2701719d8983920842636c108603c239036876 100644 (file)
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -24,8 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-loader.h"
+#include <gtk/gdk-pixbuf-loader.h>
 
 typedef struct {
        FILE             *imagefile;

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index e8cfeae0dc02943b3acddb0bc2c20757d403486b..550550bf49eac8ea63eb3c99ba49c3b13a8c1c7b 100644 (file)
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,7 +1,6 @@
 #include <config.h>
 #include <gtk/gtk.h>
-#include "x11/gdkx.h"
-#include "gdk-pixbuf.h"
+#include <gdk/x11/gdkx.h>
 
 int close_app(GtkWidget *widget, gpointer data)
 {

diff --git a/demos/testpixbuf-scale.c b/demos/testpixbuf-scale.c
index 863c076bab516744075dcac39a3c27c162a14e21..932d13cf4ba3dc75c18facffc943d830e9878846 100644 (file)
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
 
 #include <stdio.h>
 

diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index cb1092c1aedd915b6d34e3bf7f8e2902a1cd4e77..f4966fcba7c5521ff2d95b050588442d12dfa093 100644 (file)
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -23,8 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-loader.h"
+#include <gtk/gdk-pixbuf-loader.h>
 
 typedef struct {
        FILE             *imagefile;