diff options
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/Makefile.am | 6 | ||||
| -rw-r--r-- | demos/conical-test.c | 2 | ||||
| -rw-r--r-- | demos/dither.c | 2 | ||||
| -rw-r--r-- | demos/gtk-utils.c | 2 | ||||
| -rw-r--r-- | demos/linear-gradient.c | 2 | ||||
| -rw-r--r-- | demos/meson.build | 4 | ||||
| -rw-r--r-- | demos/radial-test.c | 2 | ||||
| -rw-r--r-- | demos/tri-test.c | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index c58e359..f3ea0e4 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -12,10 +12,10 @@ AM_CFLAGS = $(OPENMP_CFLAGS) AM_LDFLAGS = $(OPENMP_CFLAGS) LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS) $(PNG_LIBS) -AM_CPPFLAGS = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/pixman -I$(top_srcdir)/test/utils -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS) -GTK_UTILS = gtk-utils.c gtk-utils.h ../test/utils.c ../test/utils.h \ - ../test/utils-prng.c ../test/utils-prng.h +GTK_UTILS = gtk-utils.c gtk-utils.h ../test/utils/utils.c ../test/utils/utils.h \ + ../test/utils/utils-prng.c ../test/utils/utils-prng.h DEMOS = \ clip-test \ diff --git a/demos/conical-test.c b/demos/conical-test.c index 6b32430..5ff1be9 100644 --- a/demos/conical-test.c +++ b/demos/conical-test.c @@ -1,4 +1,4 @@ -#include "../test/utils.h" +#include "utils.h" #include "gtk-utils.h" #define SIZE 128 diff --git a/demos/dither.c b/demos/dither.c index 2ab8270..63ba248 100644 --- a/demos/dither.c +++ b/demos/dither.c @@ -28,7 +28,7 @@ #include <math.h> #include <gtk/gtk.h> #include <stdlib.h> -#include "../test/utils.h" +#include "utils.h" #include "gtk-utils.h" #define WIDTH 1024 diff --git a/demos/gtk-utils.c b/demos/gtk-utils.c index b3a60ff..cac8a8d 100644 --- a/demos/gtk-utils.c +++ b/demos/gtk-utils.c @@ -1,6 +1,6 @@ #include <gtk/gtk.h> #include <config.h> -#include "../test/utils.h" +#include "utils.h" #include "gtk-utils.h" pixman_image_t * diff --git a/demos/linear-gradient.c b/demos/linear-gradient.c index 46433a6..03807a6 100644 --- a/demos/linear-gradient.c +++ b/demos/linear-gradient.c @@ -1,4 +1,4 @@ -#include "../test/utils.h" +#include "utils.h" #include "gtk-utils.h" #define WIDTH 1024 diff --git a/demos/meson.build b/demos/meson.build index 3f9d306..c844e92 100644 --- a/demos/meson.build +++ b/demos/meson.build @@ -57,8 +57,8 @@ if dep_gtk.found() d, [d + '.c', config_h, version_h], c_args : extra_demo_cflags, - link_with : [libdemo, libtestutils], - dependencies : [dep_glib, dep_gtk, dep_openmp, idep_pixman], + link_with : [libdemo], + dependencies : [idep_pixman, libtestutils_dep, dep_glib, dep_gtk, dep_openmp, dep_png], ) endforeach endif diff --git a/demos/radial-test.c b/demos/radial-test.c index 08a367c..52292eb 100644 --- a/demos/radial-test.c +++ b/demos/radial-test.c @@ -1,4 +1,4 @@ -#include "../test/utils.h" +#include "utils.h" #include "gtk-utils.h" #define NUM_GRADIENTS 9 diff --git a/demos/tri-test.c b/demos/tri-test.c index a71869a..9d213eb 100644 --- a/demos/tri-test.c +++ b/demos/tri-test.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "../test/utils.h" +#include "utils.h" #include "gtk-utils.h" int |