-SUBDIRS=po intl docs idl libspi registryd test
+SUBDIRS=xml tools droute spi-common atk-adaptor registryd dbind cspi login-helper tests po
-EXTRA_DIST= xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc
+
+EXTRA_DIST = \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
+ cspi-1.0.pc.in \
+ cspi-1.0-uninstalled.pc.in \
+ libloginhelper-1.0.pc.in \
+ libspi-1.0.pc.in \
+ libspi-1.0-uninstalled.pc.in
+
+DISTCLEANFILES = intltool-extract \
+ intltool-merge \
+ intltool-update