X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/f8b8a0b5a7352be4bb5f1ac308137369121fb691..e06d3901b3cb4f2ff2c4001a174577421f6e25c2:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b30c76a6..cf38f539 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = src test doc po help
+# 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 = \
-	     gnome-doc-utils.make \
-	     viking-remote \
-	     viking.spec \
-	     $(INTLTOOL)
+	gnome-doc-utils.make \
+	ChangeLog.0 \
+	viking.spec \
+	$(INTLTOOL)
 
 .PHONY: generate-changelog
 generate-changelog:
@@ -27,8 +29,10 @@ generate-changelog:
 dist-hook: viking.spec generate-changelog
 	cp $(top_builddir)/viking.spec $(distdir)
 
+MAINTAINERCLEANFILES = \
+	gnome-doc-utils.make
+
 DISTCLEANFILES = \
-	gnome-doc-utils.make \
 	intltool-extract \
 	intltool-merge \
 	intltool-update
@@ -37,3 +41,6 @@ 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'