Rework combo boxes to work with GTK+2.24 or earlier.

[andy/viking.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d08f602759056f594f3221d77bbf0f9e6c7076a1..4a5a270832b749c89bc0195c73b91aa950af8d59 100644 (file)
--- 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 $(DO_DOCS)
 
 INTLTOOL = \
        intltool-extract.in \
@@ -9,14 +13,11 @@ full:
        ./autogen.sh
        make
 
-bin_SCRIPTS = viking-remote
-
 EXTRA_DIST = \
-            gnome-doc-utils.make \
-                ChangeLog.0 \
-            viking-remote \
-            viking.spec \
-            $(INTLTOOL)
+       gnome-doc-utils.make \
+       ChangeLog.0 \
+       viking.spec \
+       $(INTLTOOL)
 
 .PHONY: generate-changelog
 generate-changelog:
@@ -28,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
@@ -38,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'