NULL=
-noinst_PROGRAMS = at app simple-at keysynth-demo
+noinst_PROGRAMS = test-simple at app simple-at stress-test keysynth-demo key-listener-test event-listener-test screen-review-test visual-bell keypad-test
-at_SOURCES = at.c
+stress_test_SOURCES = stress-test.c
+
+keypad_test_SOURCES = keypad-test.c
+
+key_listener_test_SOURCES = key-listener-test.c
+
+visual_bell_SOURCES = visual-bell.c
+
+event_listener_test_SOURCES = event-listener-test.c
+
+screen_review_test_SOURCES = screen-review-test.c
+
+at_SOURCES = at.c
app_SOURCES = app.c
keysynth_demo_SOURCES = keysynth-demo.c
+test_simple_SOURCES = test-simple.c
+
INCLUDES = -I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/libspi \
CFLAGS += $(TESTS_CFLAGS) $(DEBUG_CFLAGS)
-LDADD = ../util/libat-util.la ../libspi/libspi.la ../cspi/libcspi.la $(TESTS_LIBS)
-
-
+LDADD = ../libspi/libspi.la ../cspi/libcspi.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
+TESTS = test-simple