-SUBDIRS = cut-n-paste data backend po pdf ps shell
+SUBDIRS = \
+ cut-n-paste \
+ data \
+ libdocument \
+ backend \
+ properties \
+ shell \
+ po \
+ help \
+ test
+
+if ENABLE_THUMBNAILER
+SUBDIRS += thumbnailer
+endif
+
+# Applications
intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
-EXTRA_DIST = $(intltool_extra)
+EXTRA_DIST = $(intltool_extra) gnome-doc-utils.make MAINTAINERS
+
+DISTCLEANFILES = \
+ gnome-doc-utils.make \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc
+
+# Ignore scrollkeeper issues for now. @#*$& scrollkeeper
+distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf