test: Rename utils.[ch] to gtk-utils.[ch]

diff --git a/test/Makefile.am b/test/Makefile.am
index 784abe8..74f793b 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,6 +25,7 @@ window_test_LDADD = $(TEST_LDADD)
 if HAVE_GTK
 
 GTK_LDADD = $(TEST_LDADD) $(GTK_LIBS)
+GTK_UTILS = gtk-utils.c gtk-utils.h
 
 TESTPROGRAMS +=                        \
        clip-test               \
@@ -39,28 +40,28 @@ TESTPROGRAMS +=                     \
 INCLUDES += $(GTK_CFLAGS)
 
 gradient_test_LDADD = $(GTK_LDADD)
-gradient_test_SOURCES = gradient-test.c utils.c utils.h
+gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
 
 alpha_test_LDADD = $(GTK_LDADD)
-alpha_test_SOURCES = alpha-test.c utils.c utils.h
+alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
 
 composite_test_LDADD = $(GTK_LDADD)
-composite_test_SOURCES = composite-test.c utils.c utils.h
+composite_test_SOURCES = composite-test.c $(GTK_UTILS)
 
 clip_test_LDADD = $(GTK_LDADD)
-clip_test_SOURCES = clip-test.c utils.c utils.h
+clip_test_SOURCES = clip-test.c $(GTK_UTILS)
 
 clip_in_LDADD = $(GTK_LDADD)
-clip_in_SOURCES = clip-in.c utils.c utils.h
+clip_in_SOURCES = clip-in.c $(GTK_UTILS)
 
 trap_test_LDADD = $(GTK_LDADD)
-trap_test_SOURCES = trap-test.c utils.c utils.h
+trap_test_SOURCES = trap-test.c $(GTK_UTILS)
 
 screen_test_LDADD = $(GTK_LDADD)
-screen_test_SOURCES = screen-test.c utils.c utils.h
+screen_test_SOURCES = screen-test.c $(GTK_UTILS)
 
 convolution_test_LDADD = $(GTK_LDADD)
-convolution_test_SOURCES = convolution-test.c utils.c utils.h
+convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
 
 endif
 

diff --git a/test/alpha-test.c b/test/alpha-test.c
index fd6b2ec..92c2081 100644 (file)
--- a/test/alpha-test.c
+++ b/test/alpha-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 int
 main (int argc, char **argv)

diff --git a/test/clip-in.c b/test/clip-in.c
index 55459b2..5157981 100644 (file)
--- a/test/clip-in.c
+++ b/test/clip-in.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 /* This test demonstrates that clipping is done totally different depending
  * on whether the source is transformed or not.

diff --git a/test/clip-test.c b/test/clip-test.c
index cbab447..aa0df44 100644 (file)
--- a/test/clip-test.c
+++ b/test/clip-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 #define WIDTH 200
 #define HEIGHT 200

diff --git a/test/composite-test.c b/test/composite-test.c
index 2f14502..5401abf 100644 (file)
--- a/test/composite-test.c
+++ b/test/composite-test.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 #define WIDTH  60
 #define HEIGHT 60

diff --git a/test/convolution-test.c b/test/convolution-test.c
index 8609d38..da284af 100644 (file)
--- a/test/convolution-test.c
+++ b/test/convolution-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 int
 main (int argc, char **argv)

diff --git a/test/gradient-test.c b/test/gradient-test.c
index c95c714..fc84844 100644 (file)
--- a/test/gradient-test.c
+++ b/test/gradient-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 int
 main (int argc, char **argv)

diff --git a/test/utils.c b/test/gtk-utils.c
similarity index 99%
rename from test/utils.c
rename to test/gtk-utils.c
index a609315..751a164 100644 (file)
--- a/test/utils.c
+++ b/test/gtk-utils.c
@@ -3,7 +3,7 @@
 #include "pixman-private.h"    /* For image->bits.format
                                 * FIXME: there should probably be public API for this
                                 */
-#include "utils.h"
+#include "gtk-utils.h"
 
 GdkPixbuf *
 pixbuf_from_argb32 (uint32_t *bits,

diff --git a/test/utils.h b/test/gtk-utils.h
similarity index 100%
rename from test/utils.h
rename to test/gtk-utils.h

diff --git a/test/screen-test.c b/test/screen-test.c
index 5e02eee..e69dba3 100644 (file)
--- a/test/screen-test.c
+++ b/test/screen-test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 int
 main (int argc, char **argv)

diff --git a/test/trap-test.c b/test/trap-test.c
index 1da439b..19295e7 100644 (file)
--- a/test/trap-test.c
+++ b/test/trap-test.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "pixman.h"
-#include "utils.h"
+#include "gtk-utils.h"
 
 int
 main (int argc, char **argv)