aboutsummaryrefslogtreecommitdiff
path: root/pixman/test/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-11-20 14:53:20 +0000
committermarha <marha@users.sourceforge.net>2009-11-20 14:53:20 +0000
commit9e11b82359e90c0963f56c4695a4dcc8731e45c3 (patch)
treeffa3a53246352ca44ccfc4d90e7cca993ad0b02e /pixman/test/Makefile.am
parent607c11e20aca5c9f13d5e6ab80153b10c249162b (diff)
parent4ac4a5b7ce8cc8f195d69a42da10d386eaa5c056 (diff)
downloadvcxsrv-9e11b82359e90c0963f56c4695a4dcc8731e45c3.tar.gz
vcxsrv-9e11b82359e90c0963f56c4695a4dcc8731e45c3.tar.bz2
vcxsrv-9e11b82359e90c0963f56c4695a4dcc8731e45c3.zip
svn merge ^/branches/released
Diffstat (limited to 'pixman/test/Makefile.am')
-rw-r--r--pixman/test/Makefile.am27
1 files changed, 17 insertions, 10 deletions
diff --git a/pixman/test/Makefile.am b/pixman/test/Makefile.am
index c56f62de7..89d32e96f 100644
--- a/pixman/test/Makefile.am
+++ b/pixman/test/Makefile.am
@@ -5,6 +5,7 @@ TESTPROGRAMS = \
region-test \
scaling-test \
blitters-test \
+ composite \
fetch-test \
oob-test \
window-test \
@@ -12,17 +13,23 @@ TESTPROGRAMS = \
fetch_test_LDADD = $(TEST_LDADD)
region_test_LDADD = $(TEST_LDADD)
-scaling_test_LDADD = $(TEST_LDADD)
-blitters_test_LDADD = $(TEST_LDADD)
+composite_LDADD = $(TEST_LDADD)
trap_crasher_LDADD = $(TEST_LDADD)
oob_test_LDADD = $(TEST_LDADD)
window_test_LDADD = $(TEST_LDADD)
+blitters_test_LDADD = $(TEST_LDADD)
+blitters_test_SOURCES = blitters-test.c utils.c utils.h
+
+scaling_test_LDADD = $(TEST_LDADD)
+scaling_test_SOURCES = scaling-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 += \
clip-test \
@@ -37,28 +44,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