Move all the GTK+ based test programs to a new subdir, "demos"

This separates the test suite from the random gtk+ using test
programs. "demos" is somewhat misleading because the programs there
are not particularly exciting (with the possible exception of
composite-test which shows off all the compositing operators).

diff --git a/Makefile.am b/Makefile.am
index 63b08c1..062c58a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = pixman test
+SUBDIRS = pixman test demos
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=pixman-1.pc

diff --git a/configure.ac b/configure.ac
index ab2ecde..5242799 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -794,6 +794,7 @@ AC_OUTPUT([pixman-1.pc
            Makefile
           pixman/Makefile
           pixman/pixman-version.h
+          demos/Makefile
           test/Makefile])
 
 m4_if(m4_eval(pixman_minor % 2), [1], [

diff --git a/demos/Makefile.am b/demos/Makefile.am
new file mode 100644 (file)
index 0000000..2dcdfd3
--- /dev/null
+++ b/demos/Makefile.am
@@ -0,0 +1,34 @@
+if HAVE_GTK
+
+AM_CFLAGS = @OPENMP_CFLAGS@
+AM_LDFLAGS = @OPENMP_CFLAGS@
+
+LDADD = $(GTK_LIBS) $(top_builddir)/pixman/libpixman-1.la -lm 
+INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS)
+
+GTK_UTILS = gtk-utils.c gtk-utils.h
+
+DEMOS =                                \
+       clip-test               \
+       clip-in                 \
+       composite-test          \
+       gradient-test           \
+       radial-test             \
+       alpha-test              \
+       screen-test             \
+       convolution-test        \
+       trap-test
+
+gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
+alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
+composite_test_SOURCES = composite-test.c $(GTK_UTILS)
+clip_test_SOURCES = clip-test.c $(GTK_UTILS)
+clip_in_SOURCES = clip-in.c $(GTK_UTILS)
+trap_test_SOURCES = trap-test.c $(GTK_UTILS)
+screen_test_SOURCES = screen-test.c $(GTK_UTILS)
+convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
+radial_test_SOURCES = radial-test.c ../test/utils.c ../test/utils.h $(GTK_UTILS)
+
+noinst_PROGRAMS = $(DEMOS)
+
+endif

diff --git a/test/alpha-test.c b/demos/alpha-test.c
similarity index 100%
rename from test/alpha-test.c
rename to demos/alpha-test.c

diff --git a/test/clip-in.c b/demos/clip-in.c
similarity index 100%
rename from test/clip-in.c
rename to demos/clip-in.c

diff --git a/test/clip-test.c b/demos/clip-test.c
similarity index 100%
rename from test/clip-test.c
rename to demos/clip-test.c

diff --git a/test/composite-test.c b/demos/composite-test.c
similarity index 100%
rename from test/composite-test.c
rename to demos/composite-test.c

diff --git a/test/convolution-test.c b/demos/convolution-test.c
similarity index 100%
rename from test/convolution-test.c
rename to demos/convolution-test.c

diff --git a/test/gradient-test.c b/demos/gradient-test.c
similarity index 100%
rename from test/gradient-test.c
rename to demos/gradient-test.c

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

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

diff --git a/test/radial-test.c b/demos/radial-test.c
similarity index 99%
rename from test/radial-test.c
rename to demos/radial-test.c
index 5d716c3..35e90d7 100644 (file)
--- a/test/radial-test.c
+++ b/demos/radial-test.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "../test/utils.h"
 #include "gtk-utils.h"
 
 #define NUM_GRADIENTS 7

diff --git a/test/screen-test.c b/demos/screen-test.c
similarity index 100%
rename from test/screen-test.c
rename to demos/screen-test.c

diff --git a/test/trap-test.c b/demos/trap-test.c
similarity index 100%
rename from test/trap-test.c
rename to demos/trap-test.c

diff --git a/test/Makefile.am b/test/Makefile.am
index 8d8471d..92ee8fd 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -80,55 +80,6 @@ stress_test_LDADD = $(TEST_LDADD)
 stress_test_LDFLAGS = @TESTPROGS_EXTRA_LDFLAGS@
 stress_test_SOURCES = stress-test.c utils.c utils.h
 
-# GTK using test programs
-
-if HAVE_GTK
-
-GTK_LDADD = $(TEST_LDADD) $(GTK_LIBS)
-GTK_UTILS = gtk-utils.c gtk-utils.h
-
-TESTPROGRAMS_GTK =             \
-       clip-test               \
-       clip-in                 \
-       composite-test          \
-       gradient-test           \
-       radial-test             \
-       alpha-test              \
-       screen-test             \
-       convolution-test        \
-       trap-test
-
-INCLUDES += $(GTK_CFLAGS)
-
-gradient_test_LDADD = $(GTK_LDADD)
-gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
-
-radial_test_LDADD = $(GTK_LDADD)
-radial_test_SOURCES = radial-test.c utils.c utils.h $(GTK_UTILS)
-
-alpha_test_LDADD = $(GTK_LDADD)
-alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
-
-composite_test_LDADD = $(GTK_LDADD)
-composite_test_SOURCES = composite-test.c $(GTK_UTILS)
-
-clip_test_LDADD = $(GTK_LDADD)
-clip_test_SOURCES = clip-test.c $(GTK_UTILS)
-
-clip_in_LDADD = $(GTK_LDADD)
-clip_in_SOURCES = clip-in.c $(GTK_UTILS)
-
-trap_test_LDADD = $(GTK_LDADD)
-trap_test_SOURCES = trap-test.c $(GTK_UTILS)
-
-screen_test_LDADD = $(GTK_LDADD)
-screen_test_SOURCES = screen-test.c $(GTK_UTILS)
-
-convolution_test_LDADD = $(GTK_LDADD)
-convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
-
-endif
-
 # Benchmarks
 
 BENCHMARKS =                   \
@@ -137,6 +88,6 @@ BENCHMARKS =                 \
 lowlevel_blt_bench_SOURCES = lowlevel-blt-bench.c utils.c utils.h
 lowlevel_blt_bench_LDADD = $(TEST_LDADD)
 
-noinst_PROGRAMS = $(TESTPROGRAMS) $(TESTPROGRAMS_GTK) $(BENCHMARKS)
+noinst_PROGRAMS = $(TESTPROGRAMS) $(BENCHMARKS)
 
 TESTS = $(TESTPROGRAMS)