diff options
author | Raja R Harinath <harinath@src.gnome.org> | 2000-06-22 00:05:44 +0000 |
---|---|---|
committer | Raja R Harinath <harinath@src.gnome.org> | 2000-06-22 00:05:44 +0000 |
commit | 30bd71e2ae64eacda71d8aa63623fe0c8686debb (patch) | |
tree | 6597d5581906325669fd094e285627a2e3c867b4 /demos | |
parent | 8a7664a1ae6846b58ab7e9a7e1f3867da6cd64a3 (diff) | |
download | gtk+-30bd71e2ae64eacda71d8aa63623fe0c8686debb.tar.gz |
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.
Diffstat (limited to 'demos')
-rw-r--r-- | demos/Makefile.am | 2 | ||||
-rw-r--r-- | demos/pixbuf-demo.c | 3 | ||||
-rw-r--r-- | demos/testanimation.c | 3 | ||||
-rw-r--r-- | demos/testpixbuf-drawable.c | 3 | ||||
-rw-r--r-- | demos/testpixbuf-scale.c | 1 | ||||
-rw-r--r-- | demos/testpixbuf.c | 3 |
6 files changed, 4 insertions, 11 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index a0fcc3d673..8d7ca2f756 100644 --- 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 77e7c94058..a256c49416 100644 --- 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> diff --git a/demos/testanimation.c b/demos/testanimation.c index d3aeb7f286..dd2701719d 100644 --- 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 e8cfeae0dc..550550bf49 100644 --- 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 863c076bab..932d13cf4b 100644 --- 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 cb1092c1ae..f4966fcba7 100644 --- 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; |