Merge libgdk and libgtk

[~andy/gtk] / gdk / tests / Makefile.am

diff --git a/gdk/tests/Makefile.am b/gdk/tests/Makefile.am
index 1e4189ef24e2a1471e8c8098b8fa204294be9476..9a7531421e4e939297b568c3b8bfbbfb5fd4a4c8 100644 (file)
--- a/gdk/tests/Makefile.am
+++ b/gdk/tests/Makefile.am
@@ -2,19 +2,29 @@ include $(top_srcdir)/Makefile.decl
 
 NULL=
 
-check_PROGRAMS=check-gdk-cairo
-TESTS=$(check_PROGRAMS)
+noinst_PROGRAMS = $(TEST_PROGS)
 
-AM_CPPFLAGS=\
+AM_CPPFLAGS = \
        $(GDK_DEP_CFLAGS) \
+       -I$(top_srcdir) \
        -I$(top_builddir)/gdk \
        $(NULL)
 
-check_gdk_cairo_SOURCES=\
-       check-gdk-cairo.c \
-       $(NULL)
-check_gdk_cairo_LDADD=\
+progs_ldadd = \
        $(GDK_DEP_LIBS) \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
-       $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \
+       $(top_builddir)/gdk/libgdk-$(GTK_API_VERSION).la \
        $(NULL)
+
+#TEST_PROGS              += check-gdk-cairo
+check_gdk_cairo_SOURCES  = check-gdk-cairo.c
+check_gdk_cairo_LDADD    = $(progs_ldadd)
+
+TEST_PROGS        += gdk-color
+gdk_color_SOURCES  = gdk-color.c
+gdk_color_LDADD    = $(progs_ldadd)
+
+CLEANFILES = \
+       cairosurface.png        \
+       gdksurface.png
+
+-include $(top_srcdir)/git.mk