-SUBDIRS = docs idl libspi registryd atk-bridge cspi util test
+SUBDIRS=dbind droute atk-adaptor po schemas
+
+gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
+gtk_modules_DATA = at-spi2-atk.desktop
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc
-
-EXTRA_DIST = \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
- cspi-1.0.pc.in \
- libspi-1.0.pc.in
+pkgconfig_DATA = atk-bridge-2.0.pc
+
+EXTRA_DIST = $(gtk_modules_DATA) atk-bridge-2.0.pc.in
+