Add git.mk to generate .gitignore files

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

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 83629393cd665ee46e436907e72313d3f857d152..4c8ff1f1a6d0a4f57b4c6a6a2ceb5094a3c6a199 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES = \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED        \
        -DGTK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \
@@ -51,7 +50,10 @@ TEST_PROGS                   += object
 object_SOURCES                  = object.c pixbuf-init.c
 object_LDADD                    = $(progs_ldadd)
 
-TEST_PROGS                     += crossingevents
+# this doesn't work in make distcheck, since running
+# on a naked X server creates slightly different event
+# sequences than running on a normal desktop
+# TEST_PROGS                   += crossingevents
 crossingevents_SOURCES          = crossingevents.c
 crossingevents_LDADD            = $(progs_ldadd)
 
@@ -75,3 +77,5 @@ defaultvalue_LDADD             = $(progs_ldadd)
 TEST_PROGS                     += textbuffer
 textbuffer_SOURCES              = textbuffer.c pixbuf-init.c
 textbuffer_LDADD                = $(progs_ldadd)
+
+-include $(top_srcdir)/git.mk