X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/a5f62c88b3f64f0be66bf1162778179bd12a5647..07e29a64ddb04c693032ee39788f96c525bed76d:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 858c4367..cf38f539 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = src test doc po
+# Optionally build documentation bits
+if VIKING_DOC
+	DO_DOCS = "doc"
+endif
+SUBDIRS = src test data po win32 help tools $(DO_DOCS)
 
 INTLTOOL = \
 	intltool-extract.in \
@@ -9,13 +13,11 @@ full:
 	./autogen.sh
 	make
 
-bin_SCRIPTS = viking-remote
-
 EXTRA_DIST = \
-		 ChangeLog.0 \
-	     viking-remote \
-	     viking.spec \
-	     $(INTLTOOL)
+	gnome-doc-utils.make \
+	ChangeLog.0 \
+	viking.spec \
+	$(INTLTOOL)
 
 .PHONY: generate-changelog
 generate-changelog:
@@ -27,9 +29,18 @@ generate-changelog:
 dist-hook: viking.spec generate-changelog
 	cp $(top_builddir)/viking.spec $(distdir)
 
+MAINTAINERCLEANFILES = \
+	gnome-doc-utils.make
+
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update
 
 ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS = \
+	--disable-scrollkeeper
+
+# Ignore gtk theme cache files on distcheck
+distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'