-SUBDIRS=po docs idl libspi registryd at-bridge cspi test
+SUBDIRS = docs idl libspi registryd at-bridge cspi util test
-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
+
+EXTRA_DIST = \
+ xml-i18n-extract.in \
+ xml-i18n-merge.in \
+ xml-i18n-update.in \
+ at-spi-1.0.pc.in