-SUBDIRS = docs idl libspi registryd at-bridge cspi util test
+SUBDIRS=droute atk-adaptor
+
+if ATSPI_TESTS
+
+SUBDIRS += tests
+
+endif
+
+gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
+gtk_modules_DATA = at-spi2-atk.desktop
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = at-spi-1.0.pc
+pkgconfig_DATA = atk-bridge-2.0.pc
+
+EXTRA_DIST = $(gtk_modules_DATA) atk-bridge-2.0.pc.in
-EXTRA_DIST = \
- xml-i18n-extract.in \
- xml-i18n-merge.in \
- xml-i18n-update.in \
- at-spi-1.0.pc.in
+DISTCHECK_CONFIGURE_FLAGS = --with-tests=yes