-NULL=
+LDADD = $(top_builddir)/atspi/libatspi.la
-noinst_PROGRAMS = test-simple at app simple-at keysynth-demo accessx-gui wm_test
+bin_PROGRAMS = at_spi2_tool
+at_spi2_tool_SOURCES = at_spi2_tool.c
+at_spi2_tool_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/atspi
+at_spi2_tool_CFLAGS = $(GIO_CFLAGS) $(GLIB_CFLAGS) --std=c99 -Wall -fPIE $(GOBJ_LIBS) $(DBUS_CFLAGS)
+at_spi2_tool_LDFLAGS = $(GIO_LIBS) -pie
-wm_test_SOURCES = wm_mode_test.c
-at_SOURCES = at.c
+noinst_PROGRAMS = memory
+memory_SOURCES = memory.c
+memory_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/atspi
+memory_CFLAGS = $(GLIB_CFLAGS) $(GOBJ_LIBS) $(DBUS_CFLAGS)
+memory_LDFLAGS =
-app_SOURCES = app.c
-simple_at_SOURCES = simple-at.c
-
-keysynth_demo_SOURCES = keysynth-demo.c
-
-accessx_gui_SOURCES = accessx-gui.c
-
-test_simple_SOURCES = test-simple.c
-
-INCLUDES = -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/libspi \
- -I$(top_builddir)/libspi \
- -I$(top_srcdir)/cspi \
- -I$(top_builddir)/cspi \
- $(TESTS_CFLAGS)
-
-DEBUG_CFLAGS=-DSPI_DEBUG
-
-CFLAGS += $(TESTS_CFLAGS) $(DEBUG_CFLAGS)
-
-LDADD = ../util/libat-util.la ../libspi/libspi.la ../cspi/libcspi.la $(TESTS_LIBS) $(X_LIBS)
-
-TESTS = test-simple
+-include $(top_srcdir)/git.mk